Commit 33677b48 authored by Sam Muhammed's avatar Sam Muhammed Committed by Greg Kroah-Hartman

Staging: rtl8192u: ieee80211: Use netdev_info() with network devices.

netdev_info() should be used instead of printk(KERN_INFO ...)
since it's specific to and preferable for printing messages
for network devices.
Signed-off-by: default avatarSam Muhammed <jane.pnx9@gmail.com>
Link: https://lore.kernel.org/r/ce20980cc1947255b8a2de3c1f1364c11c163b9e.1585233434.git.jane.pnx9@gmail.comSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6a569336
...@@ -1270,14 +1270,15 @@ static void ieee80211_associate_step2(struct ieee80211_device *ieee) ...@@ -1270,14 +1270,15 @@ static void ieee80211_associate_step2(struct ieee80211_device *ieee)
static void ieee80211_associate_complete_wq(struct work_struct *work) static void ieee80211_associate_complete_wq(struct work_struct *work)
{ {
struct ieee80211_device *ieee = container_of(work, struct ieee80211_device, associate_complete_wq); struct ieee80211_device *ieee = container_of(work, struct ieee80211_device, associate_complete_wq);
printk(KERN_INFO "Associated successfully\n");
netdev_info(ieee->dev, "Associated successfully\n");
if (ieee80211_is_54g(&ieee->current_network) && if (ieee80211_is_54g(&ieee->current_network) &&
(ieee->modulation & IEEE80211_OFDM_MODULATION)) { (ieee->modulation & IEEE80211_OFDM_MODULATION)) {
ieee->rate = 108; ieee->rate = 108;
printk(KERN_INFO"Using G rates:%d\n", ieee->rate); netdev_info(ieee->dev, "Using G rates:%d\n", ieee->rate);
} else { } else {
ieee->rate = 22; ieee->rate = 22;
printk(KERN_INFO"Using B rates:%d\n", ieee->rate); netdev_info(ieee->dev, "Using B rates:%d\n", ieee->rate);
} }
if (ieee->pHTInfo->bCurrentHTSupport && ieee->pHTInfo->bEnableHT) { if (ieee->pHTInfo->bCurrentHTSupport && ieee->pHTInfo->bEnableHT) {
printk("Successfully associated, ht enabled\n"); printk("Successfully associated, ht enabled\n");
...@@ -1391,12 +1392,13 @@ inline void ieee80211_softmac_new_net(struct ieee80211_device *ieee, struct ieee ...@@ -1391,12 +1392,13 @@ inline void ieee80211_softmac_new_net(struct ieee80211_device *ieee, struct ieee
strncpy(ieee->current_network.ssid, tmp_ssid, IW_ESSID_MAX_SIZE); strncpy(ieee->current_network.ssid, tmp_ssid, IW_ESSID_MAX_SIZE);
ieee->current_network.ssid_len = tmp_ssid_len; ieee->current_network.ssid_len = tmp_ssid_len;
printk(KERN_INFO"Linking with %s,channel:%d, qos:%d, myHT:%d, networkHT:%d\n", netdev_info(ieee->dev,
ieee->current_network.ssid, "Linking with %s,channel:%d, qos:%d, myHT:%d, networkHT:%d\n",
ieee->current_network.channel, ieee->current_network.ssid,
ieee->current_network.qos_data.supported, ieee->current_network.channel,
ieee->pHTInfo->bEnableHT, ieee->current_network.qos_data.supported,
ieee->current_network.bssht.bdSupportHT); ieee->pHTInfo->bEnableHT,
ieee->current_network.bssht.bdSupportHT);
//ieee->pHTInfo->IOTAction = 0; //ieee->pHTInfo->IOTAction = 0;
HTResetIOTSetting(ieee->pHTInfo); HTResetIOTSetting(ieee->pHTInfo);
...@@ -1421,11 +1423,13 @@ inline void ieee80211_softmac_new_net(struct ieee80211_device *ieee, struct ieee ...@@ -1421,11 +1423,13 @@ inline void ieee80211_softmac_new_net(struct ieee80211_device *ieee, struct ieee
(ieee->modulation & IEEE80211_OFDM_MODULATION)) { (ieee->modulation & IEEE80211_OFDM_MODULATION)) {
ieee->rate = 108; ieee->rate = 108;
ieee->SetWirelessMode(ieee->dev, IEEE_G); ieee->SetWirelessMode(ieee->dev, IEEE_G);
printk(KERN_INFO"Using G rates\n"); netdev_info(ieee->dev,
"Using G rates\n");
} else { } else {
ieee->rate = 22; ieee->rate = 22;
ieee->SetWirelessMode(ieee->dev, IEEE_B); ieee->SetWirelessMode(ieee->dev, IEEE_B);
printk(KERN_INFO"Using B rates\n"); netdev_info(ieee->dev,
"Using B rates\n");
} }
memset(ieee->dot11HTOperationalRateSet, 0, 16); memset(ieee->dot11HTOperationalRateSet, 0, 16);
//HTSetConnectBwMode(ieee, HT_CHANNEL_WIDTH_20, HT_EXTCHNL_OFFSET_NO_EXT); //HTSetConnectBwMode(ieee, HT_CHANNEL_WIDTH_20, HT_EXTCHNL_OFFSET_NO_EXT);
...@@ -1622,7 +1626,7 @@ ieee80211_rx_assoc_rq(struct ieee80211_device *ieee, struct sk_buff *skb) ...@@ -1622,7 +1626,7 @@ ieee80211_rx_assoc_rq(struct ieee80211_device *ieee, struct sk_buff *skb)
if (assoc_rq_parse(skb, dest) != -1) if (assoc_rq_parse(skb, dest) != -1)
ieee80211_resp_to_assoc_rq(ieee, dest); ieee80211_resp_to_assoc_rq(ieee, dest);
printk(KERN_INFO"New client associated: %pM\n", dest); netdev_info(ieee->dev, "New client associated: %pM\n", dest);
//FIXME //FIXME
} }
......
...@@ -459,8 +459,8 @@ int ieee80211_wx_set_rawtx(struct ieee80211_device *ieee, ...@@ -459,8 +459,8 @@ int ieee80211_wx_set_rawtx(struct ieee80211_device *ieee,
else else
ieee->raw_tx = 0; ieee->raw_tx = 0;
printk(KERN_INFO"raw TX is %s\n", netdev_info(ieee->dev, "raw TX is %s\n",
ieee->raw_tx ? "enabled" : "disabled"); ieee->raw_tx ? "enabled" : "disabled");
if (ieee->iw_mode == IW_MODE_MONITOR) { if (ieee->iw_mode == IW_MODE_MONITOR) {
if (prev == 0 && ieee->raw_tx) { if (prev == 0 && ieee->raw_tx) {
......
...@@ -203,8 +203,8 @@ int ieee80211_encrypt_fragment( ...@@ -203,8 +203,8 @@ int ieee80211_encrypt_fragment(
atomic_dec(&crypt->refcnt); atomic_dec(&crypt->refcnt);
if (res < 0) { if (res < 0) {
printk(KERN_INFO "%s: Encryption failed: len=%d.\n", netdev_info(ieee->dev, "Encryption failed: len=%d.\n",
ieee->dev->name, frag->len); frag->len);
ieee->ieee_stats.tx_discards++; ieee->ieee_stats.tx_discards++;
return -1; return -1;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment