diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-09-30 14:52:16 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-09-30 14:52:29 -0400 |
| commit | 8e00f5fbb4ecbc3431fa686cba60cd76a62604af (patch) | |
| tree | 78aa3bdef892dbd1afc8969fc528e529cfc266f7 /drivers/net/wireless/wl3501_cs.c | |
| parent | 56fd49e399ce1d82200fad5b8924d4e35a587809 (diff) | |
| parent | 0874073570d9184a169a4ae2abbe8dbcb71878e9 (diff) | |
Merge branch 'master' of git://git.infradead.org/users/linville/wireless-next into for-davem
Conflicts:
drivers/net/wireless/iwlwifi/iwl-pci.c
drivers/net/wireless/wl12xx/main.c
Diffstat (limited to 'drivers/net/wireless/wl3501_cs.c')
| -rw-r--r-- | drivers/net/wireless/wl3501_cs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/wl3501_cs.c b/drivers/net/wireless/wl3501_cs.c index 6bc7c92fbff..98fbf54f600 100644 --- a/drivers/net/wireless/wl3501_cs.c +++ b/drivers/net/wireless/wl3501_cs.c @@ -1781,7 +1781,7 @@ static int wl3501_get_encode(struct net_device *dev, keys, len_keys); if (rc) goto out; - tocopy = min_t(u8, len_keys, wrqu->encoding.length); + tocopy = min_t(u16, len_keys, wrqu->encoding.length); tocopy = min_t(u8, tocopy, 100); wrqu->encoding.length = tocopy; memcpy(extra, keys, tocopy); |