diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-02-21 15:06:35 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-02-21 15:06:35 -0500 |
| commit | a9802d43f205faa2fff422502a1336a50b9615c3 (patch) | |
| tree | 57152d6c84556320570802d01bbe04cefd8a2a7d /drivers/net/wireless/ipw2x00 | |
| parent | 0b0a635f79f91f3755b6518627ea06dd0dbfd523 (diff) | |
| parent | ca994a36f585432458ead9133fcfe05440edbb7b (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Diffstat (limited to 'drivers/net/wireless/ipw2x00')
| -rw-r--r-- | drivers/net/wireless/ipw2x00/libipw_rx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/ipw2x00/libipw_rx.c b/drivers/net/wireless/ipw2x00/libipw_rx.c index 32a9966c3bf6..c4955d25a19a 100644 --- a/drivers/net/wireless/ipw2x00/libipw_rx.c +++ b/drivers/net/wireless/ipw2x00/libipw_rx.c | |||
| @@ -172,7 +172,7 @@ libipw_rx_frame_mgmt(struct libipw_device *ieee, struct sk_buff *skb, | |||
| 172 | u16 stype) | 172 | u16 stype) |
| 173 | { | 173 | { |
| 174 | if (ieee->iw_mode == IW_MODE_MASTER) { | 174 | if (ieee->iw_mode == IW_MODE_MASTER) { |
| 175 | printk(KERN_DEBUG "%s: Master mode not yet suppported.\n", | 175 | printk(KERN_DEBUG "%s: Master mode not yet supported.\n", |
| 176 | ieee->dev->name); | 176 | ieee->dev->name); |
| 177 | return 0; | 177 | return 0; |
| 178 | /* | 178 | /* |