diff options
| author | Jeff Garzik <jeff@garzik.org> | 2007-02-10 00:12:09 +0300 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-02-10 00:12:09 +0300 |
| commit | a3cc2de9138f1ee1581f55927f33f7d72ed6207d (patch) | |
| tree | 4f0dbdb1b18bf24987485facb5e7800e242d932f /net | |
| parent | e45d9ab4051d99c9f237c96e75c4dd6671661236 (diff) | |
| parent | 46b8c85e1df091fe2d53ae7d02addb0dc58a9123 (diff) | |
| download | linux-a3cc2de9138f1ee1581f55927f33f7d72ed6207d.tar.xz | |
Merge branch 'upstream' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream
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 44db095a8f7e..cd59ac620092 100644 --- a/net/core/net-sysfs.c +++ b/net/core/net-sysfs.c @@ -340,7 +340,7 @@ static struct attribute_group netstat_group = { .attrs = netstat_attrs, }; -#ifdef WIRELESS_EXT +#ifdef CONFIG_WIRELESS_EXT /* helper function that does all the locking etc for wireless stats */ static ssize_t wireless_show(struct device *d, char *buf, ssize_t (*format)(const struct iw_statistics *, @@ -473,7 +473,7 @@ int netdev_register_sysfs(struct net_device *net) if (net->get_stats) *groups++ = &netstat_group; -#ifdef WIRELESS_EXT +#ifdef CONFIG_WIRELESS_EXT if (net->wireless_handlers && net->wireless_handlers->get_wireless_stats) *groups++ = &wireless_group; #endif diff --git a/net/ieee80211/ieee80211_tx.c b/net/ieee80211/ieee80211_tx.c index 854fc13cd78d..54e01160166f 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) if (host_encrypt) ieee80211_encrypt_fragment(ieee, skb_frag, hdr_len); else if (host_build_iv) { - struct ieee80211_crypt_data *crypt; - - crypt = ieee->crypt[ieee->tx_keyidx]; atomic_inc(&crypt->refcnt); if (crypt->ops->build_iv) crypt->ops->build_iv(skb_frag, hdr_len, |