diff options
| author | Greg Kroah-Hartman | 2010-08-05 23:18:03 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2010-08-05 23:18:03 +0200 |
| commit | e9563355ac1175dd3440dc2ea5c28b27ed51a283 (patch) | |
| tree | 8546d55832714b5d19ba4c7799266918ca04882e /drivers/staging/otus/80211core/ctxrx.c | |
| parent | Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/pow... (diff) | |
| parent | Staging: ti-st: update TODO (diff) | |
| download | kernel-qcow2-linux-e9563355ac1175dd3440dc2ea5c28b27ed51a283.tar.gz kernel-qcow2-linux-e9563355ac1175dd3440dc2ea5c28b27ed51a283.tar.xz kernel-qcow2-linux-e9563355ac1175dd3440dc2ea5c28b27ed51a283.zip | |
Staging: Merge staging-next into Linus's tree
Conflicts:
drivers/staging/Kconfig
drivers/staging/batman-adv/bat_sysfs.c
drivers/staging/batman-adv/device.c
drivers/staging/batman-adv/hard-interface.c
drivers/staging/cx25821/cx25821-audups11.c
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/otus/80211core/ctxrx.c')
| -rw-r--r-- | drivers/staging/otus/80211core/ctxrx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/otus/80211core/ctxrx.c b/drivers/staging/otus/80211core/ctxrx.c index a127196260e6..135167d23d0f 100644 --- a/drivers/staging/otus/80211core/ctxrx.c +++ b/drivers/staging/otus/80211core/ctxrx.c @@ -3117,7 +3117,7 @@ u16_t zfWlanRxFilter(zdev_t* dev, zbuf_t* buf) index = (src[2]+up) & (ZM_FILTER_TABLE_ROW-1); - /* TBD : filter frame with source address == own MAC adress */ + /* TBD : filter frame with source address == own MAC address */ if ((wd->macAddr[0] == src[0]) && (wd->macAddr[1] == src[1]) && (wd->macAddr[2] == src[2])) { |