diff options
| author |   David S. Miller <davem@davemloft.net> | 2010-05-28 22:36:41 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-05-28 22:36:41 -0700 |
| commit | e5e5cf4c71508ed38e921b31b438b8b349409f2a (patch) | |
| tree | 1e5f57fb8adaae40746031c2bec77c986cbbc52b /net | |
| parent | netlink: bug fix: wrong size was calculated for vfinfo list blob (diff) | |
| parent | ssb: fix NULL ptr deref when pcihost_wrapper is used (diff) | |
| download | linux-dev-e5e5cf4c71508ed38e921b31b438b8b349409f2a.tar.xz linux-dev-e5e5cf4c71508ed38e921b31b438b8b349409f2a.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'net')
| -rw-r--r-- | net/mac80211/chan.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/chan.c b/net/mac80211/chan.c index 5d218c530a4e..32be11e4c4d9 100644 --- a/net/mac80211/chan.c +++ b/net/mac80211/chan.c @@ -5,7 +5,7 @@ #include <linux/nl80211.h> #include "ieee80211_i.h" -enum ieee80211_chan_mode +static enum ieee80211_chan_mode __ieee80211_get_channel_mode(struct ieee80211_local *local, struct ieee80211_sub_if_data *ignore) { |