diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-06-20 04:46:02 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-06-20 04:46:02 -0400 |
| commit | 4b2d9cf00962d0a0e697f887f3ecaa155cbde555 (patch) | |
| tree | 3a64ad0825e82c3df0b4d84c412c647c19e34afb /net | |
| parent | 4c1234ff24dd8dc2d9020d6315d91a71339be114 (diff) | |
| parent | 89c318ed3985da1271e00ad586f2dce8a6e75656 (diff) | |
Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream
Diffstat (limited to 'net')
| -rw-r--r-- | net/ieee80211/softmac/ieee80211softmac_wx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ieee80211/softmac/ieee80211softmac_wx.c b/net/ieee80211/softmac/ieee80211softmac_wx.c index 22aa6199185..0e65ff4e33f 100644 --- a/net/ieee80211/softmac/ieee80211softmac_wx.c +++ b/net/ieee80211/softmac/ieee80211softmac_wx.c | |||
| @@ -388,7 +388,7 @@ ieee80211softmac_wx_set_genie(struct net_device *dev, | |||
| 388 | memcpy(mac->wpa.IE, extra, wrqu->data.length); | 388 | memcpy(mac->wpa.IE, extra, wrqu->data.length); |
| 389 | dprintk(KERN_INFO PFX "generic IE set to "); | 389 | dprintk(KERN_INFO PFX "generic IE set to "); |
| 390 | for (i=0;i<wrqu->data.length;i++) | 390 | for (i=0;i<wrqu->data.length;i++) |
| 391 | dprintk("%.2x", mac->wpa.IE[i]); | 391 | dprintk("%.2x", (u8)mac->wpa.IE[i]); |
| 392 | dprintk("\n"); | 392 | dprintk("\n"); |
| 393 | mac->wpa.IElen = wrqu->data.length; | 393 | mac->wpa.IElen = wrqu->data.length; |
| 394 | } else { | 394 | } else { |