diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-22 19:54:53 (GMT) |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-22 20:01:40 (GMT) |
| commit | ae19ffbadc1b2100285a5b5b3d0a4e0a11390904 (patch) | |
| tree | 3c2086ab67398a019089a47ca3f362a4bc6db74f /drivers/staging/otus/80211core/cmm.c | |
| parent | 34e84f39a27d059a3e6ec6e8b94aafa702e6f220 (diff) | |
| parent | 9173a8ef24a6b1b8031507b35b8ffe5f85a87692 (diff) | |
| download | linux-fsl-qoriq-ae19ffbadc1b2100285a5b5b3d0a4e0a11390904.tar.xz | |
Merge branch 'master' into for-linus
Diffstat (limited to 'drivers/staging/otus/80211core/cmm.c')
| -rw-r--r-- | drivers/staging/otus/80211core/cmm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/otus/80211core/cmm.c b/drivers/staging/otus/80211core/cmm.c index b74379d..bed16b5 100644 --- a/drivers/staging/otus/80211core/cmm.c +++ b/drivers/staging/otus/80211core/cmm.c @@ -871,7 +871,7 @@ void zfSendMmFrame(zdev_t* dev, u8_t frameType, u16_t* dst, zmw_declare_for_critical_section(); zm_msg2_mm(ZM_LV_2, "Send mm frame, type=", frameType); - /* TBD : Maximum size of managment frame */ + /* TBD : Maximum size of management frame */ if ((buf = zfwBufAllocate(dev, 1024)) == NULL) { zm_msg0_mm(ZM_LV_0, "Alloc mm buf Fail!"); @@ -1099,7 +1099,7 @@ void zfSendMmFrame(zdev_t* dev, u8_t frameType, u16_t* dst, } if ((wd->sta.capability[1] & ZM_BIT_0) == 1) - { //spectrum managment flag enable + { //spectrum management flag enable offset = zfStaAddIePowerCap(dev, buf, offset); offset = zfStaAddIeSupportCh(dev, buf, offset); } |