diff options
Diffstat (limited to 'net')
-rw-r--r-- | net/core/net-sysfs.c | 4 | ||||
-rw-r--r-- | net/ieee80211/ieee80211_tx.c | 3 |
2 files changed, 2 insertions, 5 deletions
diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c index 6189dc03108d..4cbb1290a6a3 100644 --- a/net/core/net-sysfs.c +++ b/net/core/net-sysfs.c | |||
@@ -340,7 +340,7 @@ static struct attribute_group netstat_group = { | |||
340 | .attrs = netstat_attrs, | 340 | .attrs = netstat_attrs, |
341 | }; | 341 | }; |
342 | 342 | ||
343 | #ifdef WIRELESS_EXT | 343 | #ifdef CONFIG_WIRELESS_EXT |
344 | /* helper function that does all the locking etc for wireless stats */ | 344 | /* helper function that does all the locking etc for wireless stats */ |
345 | static ssize_t wireless_show(struct device *d, char *buf, | 345 | static ssize_t wireless_show(struct device *d, char *buf, |
346 | ssize_t (*format)(const struct iw_statistics *, | 346 | ssize_t (*format)(const struct iw_statistics *, |
@@ -473,7 +473,7 @@ int netdev_register_sysfs(struct net_device *net) | |||
473 | if (net->get_stats) | 473 | if (net->get_stats) |
474 | *groups++ = &netstat_group; | 474 | *groups++ = &netstat_group; |
475 | 475 | ||
476 | #ifdef WIRELESS_EXT | 476 | #ifdef CONFIG_WIRELESS_EXT |
477 | if (net->wireless_handlers && net->wireless_handlers->get_wireless_stats) | 477 | if (net->wireless_handlers && net->wireless_handlers->get_wireless_stats) |
478 | *groups++ = &wireless_group; | 478 | *groups++ = &wireless_group; |
479 | #endif | 479 | #endif |
diff --git a/net/ieee80211/ieee80211_tx.c b/net/ieee80211/ieee80211_tx.c index c55949e5c58a..0292d6348e12 100644 --- a/net/ieee80211/ieee80211_tx.c +++ b/net/ieee80211/ieee80211_tx.c | |||
@@ -502,9 +502,6 @@ int ieee80211_xmit(struct sk_buff *skb, struct net_device *dev) | |||
502 | if (host_encrypt) | 502 | if (host_encrypt) |
503 | ieee80211_encrypt_fragment(ieee, skb_frag, hdr_len); | 503 | ieee80211_encrypt_fragment(ieee, skb_frag, hdr_len); |
504 | else if (host_build_iv) { | 504 | else if (host_build_iv) { |
505 | struct ieee80211_crypt_data *crypt; | ||
506 | |||
507 | crypt = ieee->crypt[ieee->tx_keyidx]; | ||
508 | atomic_inc(&crypt->refcnt); | 505 | atomic_inc(&crypt->refcnt); |
509 | if (crypt->ops->build_iv) | 506 | if (crypt->ops->build_iv) |
510 | crypt->ops->build_iv(skb_frag, hdr_len, | 507 | crypt->ops->build_iv(skb_frag, hdr_len, |