diff options
| author | John W. Linville <linville@tuxdriver.com> | 2010-07-13 15:57:29 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-07-13 15:57:29 -0400 |
| commit | e300d955debdadf599c36e47eb0bc16f5976215c (patch) | |
| tree | 8fafcc789dc06e90665e6eee6388af228bbd2fd7 /drivers/net/wireless/hostap | |
| parent | 242647bcf8464860f173f3d4d4ab3490d3558518 (diff) | |
| parent | 815868e7b5c207ba42d5b317ccc51f8112732268 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
Conflicts:
drivers/net/wireless/wl12xx/wl1271_cmd.h
Diffstat (limited to 'drivers/net/wireless/hostap')
| -rw-r--r-- | drivers/net/wireless/hostap/hostap_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/hostap/hostap_main.c b/drivers/net/wireless/hostap/hostap_main.c index eaee84b55887..25a2722c8a98 100644 --- a/drivers/net/wireless/hostap/hostap_main.c +++ b/drivers/net/wireless/hostap/hostap_main.c | |||
| @@ -186,7 +186,7 @@ int prism2_wds_add(local_info_t *local, u8 *remote_addr, | |||
| 186 | return -ENOBUFS; | 186 | return -ENOBUFS; |
| 187 | 187 | ||
| 188 | /* verify that there is room for wds# postfix in the interface name */ | 188 | /* verify that there is room for wds# postfix in the interface name */ |
| 189 | if (strlen(local->dev->name) > IFNAMSIZ - 5) { | 189 | if (strlen(local->dev->name) >= IFNAMSIZ - 5) { |
| 190 | printk(KERN_DEBUG "'%s' too long base device name\n", | 190 | printk(KERN_DEBUG "'%s' too long base device name\n", |
| 191 | local->dev->name); | 191 | local->dev->name); |
| 192 | return -EINVAL; | 192 | return -EINVAL; |