diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-03 18:43:36 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-03 18:43:36 -0400 |
| commit | 3e0ca2f148f97c5748f52bcf2a69dd17cb2b1d13 (patch) | |
| tree | 10782f75b5b09e9bb738534410af106efb0cf926 /net | |
| parent | c7659e2c139d0be4647bef89188a932e0254d709 (diff) | |
| parent | 529d303e075aa6d988f30935b8995ffb382ad38e (diff) | |
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6:
sky2: jumbo frame regression fix
[PATCH] softmac: Fix compiler-warning
[PATCH] bcm43xx: Correct printk with PFX before KERN_
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 442b9875f3fb..5742dc803b79 100644 --- a/net/ieee80211/softmac/ieee80211softmac_wx.c +++ b/net/ieee80211/softmac/ieee80211softmac_wx.c | |||
| @@ -114,7 +114,7 @@ check_assoc_again: | |||
| 114 | sm->associnfo.associating = 1; | 114 | sm->associnfo.associating = 1; |
| 115 | /* queue lower level code to do work (if necessary) */ | 115 | /* queue lower level code to do work (if necessary) */ |
| 116 | schedule_delayed_work(&sm->associnfo.work, 0); | 116 | schedule_delayed_work(&sm->associnfo.work, 0); |
| 117 | out: | 117 | |
| 118 | mutex_unlock(&sm->associnfo.mutex); | 118 | mutex_unlock(&sm->associnfo.mutex); |
| 119 | 119 | ||
| 120 | return 0; | 120 | return 0; |