aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/rndis_wlan.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-05-24 14:54:29 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2012-05-24 14:54:29 -0400
commit28f3d717618156c0dcd2f497d791b578a7931d87 (patch)
tree37b11581b51929b5473541e53bd242b3e1a9f666 /drivers/net/wireless/rndis_wlan.c
parent654443e20dfc0617231f28a07c96a979ee1a0239 (diff)
parent1ca7ee30630e1022dbcf1b51be20580815ffab73 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Pull more networking updates from David Miller: "Ok, everything from here on out will be bug fixes." 1) One final sync of wireless and bluetooth stuff from John Linville. These changes have all been in his tree for more than a week, and therefore have had the necessary -next exposure. John was just away on a trip and didn't have a change to send the pull request until a day or two ago. 2) Put back some defines in user exposed header file areas that were removed during the tokenring purge. From Stephen Hemminger and Paul Gortmaker. 3) A bug fix for UDP hash table allocation got lost in the pile due to one of those "you got it.. no I've got it.." situations. :-) From Tim Bird. 4) SKB coalescing in TCP needs to have stricter checks, otherwise we'll try to coalesce overlapping frags and crash. Fix from Eric Dumazet. 5) RCU routing table lookups can race with free_fib_info(), causing crashes when we deref the device pointers in the route. Fix by releasing the net device in the RCU callback. From Yanmin Zhang. * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (293 commits) tcp: take care of overlaps in tcp_try_coalesce() ipv4: fix the rcu race between free_fib_info and ip_route_output_slow mm: add a low limit to alloc_large_system_hash ipx: restore token ring define to include/linux/ipx.h if: restore token ring ARP type to header xen: do not disable netfront in dom0 phy/micrel: Fix ID of KSZ9021 mISDN: Add X-Tensions USB ISDN TA XC-525 gianfar:don't add FCB length to hard_header_len Bluetooth: Report proper error number in disconnection Bluetooth: Create flags for bt_sk() Bluetooth: report the right security level in getsockopt Bluetooth: Lock the L2CAP channel when sending Bluetooth: Restore locking semantics when looking up L2CAP channels Bluetooth: Fix a redundant and problematic incoming MTU check Bluetooth: Add support for Foxconn/Hon Hai AR5BBU22 0489:E03C Bluetooth: Fix EIR data generation for mgmt_device_found Bluetooth: Fix Inquiry with RSSI event mask Bluetooth: improve readability of l2cap_seq_list code Bluetooth: Fix skb length calculation ...
Diffstat (limited to 'drivers/net/wireless/rndis_wlan.c')
-rw-r--r--drivers/net/wireless/rndis_wlan.c14
1 files changed, 0 insertions, 14 deletions
diff --git a/drivers/net/wireless/rndis_wlan.c b/drivers/net/wireless/rndis_wlan.c
index c5404eb82b2f..2e9e6af21362 100644
--- a/drivers/net/wireless/rndis_wlan.c
+++ b/drivers/net/wireless/rndis_wlan.c
@@ -505,9 +505,6 @@ static int rndis_join_ibss(struct wiphy *wiphy, struct net_device *dev,
505 505
506static int rndis_leave_ibss(struct wiphy *wiphy, struct net_device *dev); 506static int rndis_leave_ibss(struct wiphy *wiphy, struct net_device *dev);
507 507
508static int rndis_set_channel(struct wiphy *wiphy, struct net_device *dev,
509 struct ieee80211_channel *chan, enum nl80211_channel_type channel_type);
510
511static int rndis_add_key(struct wiphy *wiphy, struct net_device *netdev, 508static int rndis_add_key(struct wiphy *wiphy, struct net_device *netdev,
512 u8 key_index, bool pairwise, const u8 *mac_addr, 509 u8 key_index, bool pairwise, const u8 *mac_addr,
513 struct key_params *params); 510 struct key_params *params);
@@ -549,7 +546,6 @@ static const struct cfg80211_ops rndis_config_ops = {
549 .disconnect = rndis_disconnect, 546 .disconnect = rndis_disconnect,
550 .join_ibss = rndis_join_ibss, 547 .join_ibss = rndis_join_ibss,
551 .leave_ibss = rndis_leave_ibss, 548 .leave_ibss = rndis_leave_ibss,
552 .set_channel = rndis_set_channel,
553 .add_key = rndis_add_key, 549 .add_key = rndis_add_key,
554 .del_key = rndis_del_key, 550 .del_key = rndis_del_key,
555 .set_default_key = rndis_set_default_key, 551 .set_default_key = rndis_set_default_key,
@@ -2398,16 +2394,6 @@ static int rndis_leave_ibss(struct wiphy *wiphy, struct net_device *dev)
2398 return deauthenticate(usbdev); 2394 return deauthenticate(usbdev);
2399} 2395}
2400 2396
2401static int rndis_set_channel(struct wiphy *wiphy, struct net_device *netdev,
2402 struct ieee80211_channel *chan, enum nl80211_channel_type channel_type)
2403{
2404 struct rndis_wlan_private *priv = wiphy_priv(wiphy);
2405 struct usbnet *usbdev = priv->usbdev;
2406
2407 return set_channel(usbdev,
2408 ieee80211_frequency_to_channel(chan->center_freq));
2409}
2410
2411static int rndis_add_key(struct wiphy *wiphy, struct net_device *netdev, 2397static int rndis_add_key(struct wiphy *wiphy, struct net_device *netdev,
2412 u8 key_index, bool pairwise, const u8 *mac_addr, 2398 u8 key_index, bool pairwise, const u8 *mac_addr,
2413 struct key_params *params) 2399 struct key_params *params)