diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-10-30 00:09:18 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-10-30 00:09:18 -0700 |
| commit | 68fe0f0a6dcd2ac1ace5da3647a6d1cf0f4d2fea (patch) | |
| tree | 69d855c2e46d42ef8f23680cf3a1e6ff38de9ef4 /drivers/net/wireless/ipw2x00/libipw_wx.c | |
| parent | 88fd449e734a4264347e12b8ff74ccb33a9b9a35 (diff) | |
| parent | 8f0d8163b50e01f398b14bcd4dc039ac5ab18d64 (diff) | |
Merge tag 'v3.7-rc3' into for-linus to sync up with recent USB changes
Diffstat (limited to 'drivers/net/wireless/ipw2x00/libipw_wx.c')
| -rw-r--r-- | drivers/net/wireless/ipw2x00/libipw_wx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/ipw2x00/libipw_wx.c b/drivers/net/wireless/ipw2x00/libipw_wx.c index 1571505b1a3..54aba474443 100644 --- a/drivers/net/wireless/ipw2x00/libipw_wx.c +++ b/drivers/net/wireless/ipw2x00/libipw_wx.c @@ -675,7 +675,7 @@ int libipw_wx_set_encodeext(struct libipw_device *ieee, } done: if (ieee->set_security) - ieee->set_security(ieee->dev, &sec); + ieee->set_security(dev, &sec); return ret; } |