diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2012-07-26 14:42:10 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2012-08-20 14:13:44 +0200 |
| commit | c0af07340aae5db9f976bfe71e2e9bcab3169409 (patch) | |
| tree | 519b17d2fa5700b2b32f12b67926981228029bda | |
| parent | 9b8648704358e42f9865cd6de7cedb5ac0db67e7 (diff) | |
| download | linux-stable-c0af07340aae5db9f976bfe71e2e9bcab3169409.tar.gz linux-stable-c0af07340aae5db9f976bfe71e2e9bcab3169409.tar.bz2 linux-stable-c0af07340aae5db9f976bfe71e2e9bcab3169409.zip | |
mac80211: convert ops checks to WARN_ON
There's no need to BUG_ON when a driver registers
invalid operations, warn and return an error.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
| -rw-r--r-- | net/mac80211/main.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/net/mac80211/main.c b/net/mac80211/main.c index e706f9e5b051..bd7529363193 100644 --- a/net/mac80211/main.c +++ b/net/mac80211/main.c @@ -545,6 +545,11 @@ struct ieee80211_hw *ieee80211_alloc_hw(size_t priv_data_len, int priv_size, i; struct wiphy *wiphy; + if (WARN_ON(!ops->tx || !ops->start || !ops->stop || !ops->config || + !ops->add_interface || !ops->remove_interface || + !ops->configure_filter)) + return NULL; + if (WARN_ON(ops->sta_state && (ops->sta_add || ops->sta_remove))) return NULL; @@ -597,13 +602,6 @@ struct ieee80211_hw *ieee80211_alloc_hw(size_t priv_data_len, local->hw.priv = (char *)local + ALIGN(sizeof(*local), NETDEV_ALIGN); - BUG_ON(!ops->tx); - BUG_ON(!ops->start); - BUG_ON(!ops->stop); - BUG_ON(!ops->config); - BUG_ON(!ops->add_interface); - BUG_ON(!ops->remove_interface); - BUG_ON(!ops->configure_filter); local->ops = ops; /* set up some defaults */ |