diff options
| author | David S. Miller <davem@davemloft.net> | 2009-05-08 15:46:17 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-05-08 15:46:17 -0400 |
| commit | a8679be2073392cf22a910bc25da0c7d36459845 (patch) | |
| tree | 0d25750ea4ba3a85fe683f285261083d77080976 /net/wireless/nl80211.c | |
| parent | 22f6dacdfcfdc792d068e9c41234808860498d04 (diff) | |
| parent | 9dfd6ba353b993d648dcda72480c7ce92cd27c7e (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'net/wireless/nl80211.c')
| -rw-r--r-- | net/wireless/nl80211.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index b1fc98225fd1..3c53c5cbc3a9 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c | |||
| @@ -3696,9 +3696,9 @@ void nl80211_send_disassoc(struct cfg80211_registered_device *rdev, | |||
| 3696 | NL80211_CMD_DISASSOCIATE); | 3696 | NL80211_CMD_DISASSOCIATE); |
| 3697 | } | 3697 | } |
| 3698 | 3698 | ||
| 3699 | void nl80211_send_mlme_timeout(struct cfg80211_registered_device *rdev, | 3699 | static void nl80211_send_mlme_timeout(struct cfg80211_registered_device *rdev, |
| 3700 | struct net_device *netdev, int cmd, | 3700 | struct net_device *netdev, int cmd, |
| 3701 | const u8 *addr) | 3701 | const u8 *addr) |
| 3702 | { | 3702 | { |
| 3703 | struct sk_buff *msg; | 3703 | struct sk_buff *msg; |
| 3704 | void *hdr; | 3704 | void *hdr; |