diff options
| author | David S. Miller <davem@davemloft.net> | 2011-11-28 19:21:10 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-11-28 19:21:10 -0500 |
| commit | 8317e2047ef7d70dd76bf1d571fecaa8d4deb06f (patch) | |
| tree | c400a600a4eb00da224b4e59e76396655e853d07 /drivers/net/wireless/rtlwifi/base.c | |
| parent | 2c55a3d08ade44a778c182c220a7907ec65d5fb8 (diff) | |
| parent | 39338b56382ac640614851a80e0bd71994cc664d (diff) | |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next
Diffstat (limited to 'drivers/net/wireless/rtlwifi/base.c')
| -rw-r--r-- | drivers/net/wireless/rtlwifi/base.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/rtlwifi/base.c b/drivers/net/wireless/rtlwifi/base.c index b4ce93436d2..a13ecfce482 100644 --- a/drivers/net/wireless/rtlwifi/base.c +++ b/drivers/net/wireless/rtlwifi/base.c @@ -345,9 +345,9 @@ static void _rtl_init_mac80211(struct ieee80211_hw *hw) if (is_valid_ether_addr(rtlefuse->dev_addr)) { SET_IEEE80211_PERM_ADDR(hw, rtlefuse->dev_addr); } else { - u8 rtlmac[] = { 0x00, 0xe0, 0x4c, 0x81, 0x92, 0x00 }; - get_random_bytes((rtlmac + (ETH_ALEN - 1)), 1); - SET_IEEE80211_PERM_ADDR(hw, rtlmac); + u8 rtlmac1[] = { 0x00, 0xe0, 0x4c, 0x81, 0x92, 0x00 }; + get_random_bytes((rtlmac1 + (ETH_ALEN - 1)), 1); + SET_IEEE80211_PERM_ADDR(hw, rtlmac1); } } |