Merge tag 'pwm/for-3.20-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry...

[deliverable/linux.git] / net / mac802154 / driver-ops.h

diff --git a/net/mac802154/driver-ops.h b/net/mac802154/driver-ops.h
index f21e864613d09b6d02c4ffe8f2b7e72e78b75e16..98180a9fff4adc565f7ac9fe7fe711ef549396da 100644 (file)
--- a/net/mac802154/driver-ops.h
+++ b/net/mac802154/driver-ops.h
@@ -70,7 +70,8 @@ static inline int drv_set_tx_power(struct ieee802154_local *local, s8 dbm)
        return local->ops->set_txpower(&local->hw, dbm);
 }
 
-static inline int drv_set_cca_mode(struct ieee802154_local *local, u8 cca_mode)
+static inline int drv_set_cca_mode(struct ieee802154_local *local,
+                                  const struct wpan_phy_cca *cca)
 {
        might_sleep();
 
@@ -79,7 +80,7 @@ static inline int drv_set_cca_mode(struct ieee802154_local *local, u8 cca_mode)
                return -EOPNOTSUPP;
        }
 
-       return local->ops->set_cca_mode(&local->hw, cca_mode);
+       return local->ops->set_cca_mode(&local->hw, cca);
 }
 
 static inline int drv_set_lbt_mode(struct ieee802154_local *local, bool mode)