aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/staging/stlc45xx/stlc45xx.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/drivers/staging/stlc45xx/stlc45xx.c b/drivers/staging/stlc45xx/stlc45xx.c
index 3eced5520c5..cfdaac9b747 100644
--- a/drivers/staging/stlc45xx/stlc45xx.c
+++ b/drivers/staging/stlc45xx/stlc45xx.c
@@ -1787,7 +1787,6 @@ static int stlc45xx_tx_pspoll(struct stlc45xx *stlc, bool powersave)
1787 int payload_len, padding, i; 1787 int payload_len, padding, i;
1788 struct s_lm_data_out *data; 1788 struct s_lm_data_out *data;
1789 struct txbuffer *entry; 1789 struct txbuffer *entry;
1790 DECLARE_MAC_BUF(mac);
1791 struct sk_buff *skb; 1790 struct sk_buff *skb;
1792 char *payload; 1791 char *payload;
1793 u16 fc; 1792 u16 fc;
@@ -1813,8 +1812,8 @@ static int stlc45xx_tx_pspoll(struct stlc45xx *stlc, bool powersave)
1813 memcpy(pspoll->addr1, stlc->bssid, ETH_ALEN); 1812 memcpy(pspoll->addr1, stlc->bssid, ETH_ALEN);
1814 memcpy(pspoll->addr2, stlc->mac_addr, ETH_ALEN); 1813 memcpy(pspoll->addr2, stlc->mac_addr, ETH_ALEN);
1815 1814
1816 stlc45xx_debug(DEBUG_PSM, "sending PS-Poll frame to %s (powersave %d, " 1815 stlc45xx_debug(DEBUG_PSM, "sending PS-Poll frame to %pM (powersave %d, "
1817 "fc 0x%x, aid %d)", print_mac(mac, pspoll->addr1), 1816 "fc 0x%x, aid %d)", pspoll->addr1,
1818 powersave, fc, stlc->aid); 1817 powersave, fc, stlc->aid);
1819 1818
1820 spin_lock_bh(&stlc->tx_lock); 1819 spin_lock_bh(&stlc->tx_lock);
@@ -1903,7 +1902,6 @@ static int stlc45xx_tx_nullfunc(struct stlc45xx *stlc, bool powersave)
1903 int payload_len, padding, i; 1902 int payload_len, padding, i;
1904 struct s_lm_data_out *data; 1903 struct s_lm_data_out *data;
1905 struct txbuffer *entry; 1904 struct txbuffer *entry;
1906 DECLARE_MAC_BUF(mac);
1907 struct sk_buff *skb; 1905 struct sk_buff *skb;
1908 char *payload; 1906 char *payload;
1909 u16 fc; 1907 u16 fc;
@@ -1928,9 +1926,8 @@ static int stlc45xx_tx_nullfunc(struct stlc45xx *stlc, bool powersave)
1928 memcpy(nullfunc->addr2, stlc->mac_addr, ETH_ALEN); 1926 memcpy(nullfunc->addr2, stlc->mac_addr, ETH_ALEN);
1929 memcpy(nullfunc->addr3, stlc->bssid, ETH_ALEN); 1927 memcpy(nullfunc->addr3, stlc->bssid, ETH_ALEN);
1930 1928
1931 stlc45xx_debug(DEBUG_PSM, "sending Null frame to %s (powersave %d, " 1929 stlc45xx_debug(DEBUG_PSM, "sending Null frame to %pM (powersave %d, "
1932 "fc 0x%x)", 1930 "fc 0x%x)", nullfunc->addr1, powersave, fc);
1933 print_mac(mac, nullfunc->addr1), powersave, fc);
1934 1931
1935 spin_lock_bh(&stlc->tx_lock); 1932 spin_lock_bh(&stlc->tx_lock);
1936 1933