Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
---
drivers/staging/rtl8187se/ieee80211/ieee80211.h | 4 +-
.../rtl8187se/ieee80211/ieee80211_crypt_tkip.c | 2 +-
.../staging/rtl8187se/ieee80211/ieee80211_module.c | 4 +-
drivers/staging/rtl8187se/ieee80211/ieee80211_rx.c | 23 ++++++------
.../rtl8187se/ieee80211/ieee80211_softmac.c | 30 ++++++++--------
.../rtl8187se/ieee80211/ieee80211_softmac_wx.c | 4 +-
drivers/staging/rtl8187se/ieee80211/ieee80211_tx.c | 38 ++++++++++----------
drivers/staging/rtl8187se/ieee80211/ieee80211_wx.c | 5 +--
8 files changed, 54 insertions(+), 56 deletions(-)
diff --git a/drivers/staging/rtl8187se/ieee80211/ieee80211.h b/drivers/staging/rtl8187se/ieee80211/ieee80211.h
index 3222c22..a0f949e 100644
--- a/drivers/staging/rtl8187se/ieee80211/ieee80211.h
+++ b/drivers/staging/rtl8187se/ieee80211/ieee80211.h
@@ -203,8 +203,8 @@ do { if (ieee80211_debug_level & (level)) \
#define IEEE80211_DL_TX (1<<8)
#define IEEE80211_DL_RX (1<<9)
-#define IEEE80211_ERROR(f, a...) printk(KERN_ERR "ieee80211: " f, ## a)
-#define IEEE80211_WARNING(f, a...) printk(KERN_WARNING "ieee80211: " f, ## a)
+#define IEEE80211_ERROR(f, a...) pr_err("ieee80211: " f, ## a)
+#define IEEE80211_WARNING(f, a...) pr_warning("ieee80211: " f, ## a)
#define IEEE80211_DEBUG_INFO(f, a...) IEEE80211_DEBUG(IEEE80211_DL_INFO, f, ## a)
#define IEEE80211_DEBUG_WX(f, a...) IEEE80211_DEBUG(IEEE80211_DL_WX, f, ## a)
diff --git a/drivers/staging/rtl8187se/ieee80211/ieee80211_crypt_tkip.c b/drivers/staging/rtl8187se/ieee80211/ieee80211_crypt_tkip.c
index e6d8385..f00ab61 100644
--- a/drivers/staging/rtl8187se/ieee80211/ieee80211_crypt_tkip.c
+++ b/drivers/staging/rtl8187se/ieee80211/ieee80211_crypt_tkip.c
@@ -476,7 +476,7 @@ static int michael_mic(struct crypto_hash *tfm_michael, u8 * key, u8 * hdr,
struct scatterlist sg[2];
if (tfm_michael == NULL) {
- printk(KERN_WARNING "michael_mic: tfm_michael == NULL\n");
+ pr_warning("michael_mic: tfm_michael == NULL\n");
return -1;
}
diff --git a/drivers/staging/rtl8187se/ieee80211/ieee80211_module.c b/drivers/staging/rtl8187se/ieee80211/ieee80211_module.c
index 6fbe489..5462bd4 100644
--- a/drivers/staging/rtl8187se/ieee80211/ieee80211_module.c
+++ b/drivers/staging/rtl8187se/ieee80211/ieee80211_module.c
@@ -70,8 +70,8 @@ static inline int ieee80211_networks_allocate(struct ieee80211_device *ieee)
MAX_NETWORK_COUNT * sizeof(struct ieee80211_network),
GFP_KERNEL);
if (!ieee->networks) {
- printk(KERN_WARNING "%s: Out of memory allocating beacons\n",
- ieee->dev->name);
+ pr_warning("%s: Out of memory allocating beacons\n",
+ ieee->dev->name);
return -ENOMEM;
}
diff --git a/drivers/staging/rtl8187se/ieee80211/ieee80211_rx.c b/drivers/staging/rtl8187se/ieee80211/ieee80211_rx.c
index 5e2e79b..2d3acb8 100644
--- a/drivers/staging/rtl8187se/ieee80211/ieee80211_rx.c
+++ b/drivers/staging/rtl8187se/ieee80211/ieee80211_rx.c
@@ -412,7 +412,7 @@ static int is_duplicate_packet(struct ieee80211_device *ieee,
if (p == &ieee->ibss_mac_hash[index]) {
entry = kmalloc(sizeof(struct ieee_ibss_seq), GFP_ATOMIC);
if (!entry) {
- printk(KERN_WARNING "Cannot malloc new mac entry\n");
+ pr_warning("Cannot malloc new mac entry\n");
return 0;
}
memcpy(entry->mac, mac, ETH_ALEN);
@@ -439,18 +439,18 @@ static int is_duplicate_packet(struct ieee80211_device *ieee,
}
// if(tid != 0) {
-// printk(KERN_WARNING ":)))))))))))%x %x %x, fc(%x)\n", tid, *last_seq, seq, header->frame_ctl);
+// pr_warning(":)))))))))))%x %x %x, fc(%x)\n", tid, *last_seq, seq, header->frame_ctl);
// }
if ((*last_seq == seq) &&
time_after(*last_time + IEEE_PACKET_RETRY_TIME, jiffies)) {
if (*last_frag == frag){
- //printk(KERN_WARNING "[1] go drop!\n");
+ //pr_warning("[1] go drop!\n");
goto drop;
}
if (*last_frag + 1 != frag)
/* out-of-order fragment */
- //printk(KERN_WARNING "[2] go drop!\n");
+ //pr_warning("[2] go drop!\n");
goto drop;
} else
*last_seq = seq;
@@ -494,8 +494,8 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb,
stats = &ieee->stats;
if (skb->len < 10) {
- printk(KERN_INFO "%s: SKB length < 10\n",
- dev->name);
+ pr_info("%s: SKB length < 10\n",
+ dev->name);
goto rx_dropped;
}
@@ -654,9 +654,8 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb,
flen -= hdrlen;
if (frag_skb->tail + flen > frag_skb->end) {
- printk(KERN_WARNING "%s: host decrypted and "
- "reassembled frame did not fit skb\n",
- dev->name);
+ pr_warning("%s: host decrypted and reassembled frame did not fit skb\n",
+ dev->name);
ieee80211_frag_cache_invalidate(ieee, hdr);
goto rx_dropped;
}
@@ -737,7 +736,7 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb,
}
/*
if(ieee80211_is_eapol_frame(ieee, skb, hdrlen)) {
- printk(KERN_WARNING "RX: IEEE802.1X EPAOL frame!\n");
+ pr_warning("RX: IEEE802.1X EPAOL frame!\n");
}
*/
/* skb: hdr + (possible reassembled) full plaintext payload */
@@ -1136,7 +1135,7 @@ inline int ieee80211_network_init(
info_element->data[2] == 0xf2 &&
info_element->data[3] == 0x02 &&
info_element->data[4] == 0x00) {
- //printk(KERN_WARNING "wmm info updated: %x\n", info_element->data[6]);
+ //pr_warning("wmm info updated: %x\n", info_element->data[6]);
//WMM Information Element
network->wmm_info = info_element->data[6];
network->QoS_Enable = 1;
@@ -1150,7 +1149,7 @@ inline int ieee80211_network_init(
info_element->data[4] == 0x01) {
// Not care about version at present.
//WMM Information Element
- //printk(KERN_WARNING "wmm info¶m updated: %x\n", info_element->data[6]);
+ //pr_warning("wmm info¶m updated: %x\n", info_element->data[6]);
network->wmm_info = info_element->data[6];
//WMM Parameter Element
memcpy(network->wmm_param, (u8 *)(info_element->data + 8),(info_element->len - 8));
diff --git a/drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c b/drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c
index 59b2ab4..efd67dd 100644
--- a/drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c
+++ b/drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c
@@ -141,7 +141,7 @@ void ieee80211_TURBO_Info(struct ieee80211_device *ieee, u8 **tag_p) {
*tag++ = 0x00;
*tag_p = tag;
- printk(KERN_ALERT "This is enable turbo mode IE process\n");
+ pr_alert("This is enable turbo mode IE process\n");
}
void enqueue_mgmt(struct ieee80211_device *ieee, struct sk_buff *skb)
@@ -367,7 +367,7 @@ void ext_ieee80211_send_beacon_wq(struct ieee80211_device *ieee)
}
- //printk(KERN_WARNING "[1] beacon sending!\n");
+ //pr_warning("[1] beacon sending!\n");
ieee->beacon_timer.expires = jiffies +
(MSECS( ieee->current_network.beacon_interval -5));
@@ -391,7 +391,7 @@ void ieee80211_send_beacon(struct ieee80211_device *ieee)
dev_kfree_skb_any(skb);//edit by thomas
}
- //printk(KERN_WARNING "[1] beacon sending!\n");
+ //pr_warning("[1] beacon sending!\n");
ieee->beacon_timer.expires = jiffies +
(MSECS( ieee->current_network.beacon_interval -5));
@@ -1256,15 +1256,15 @@ void ieee80211_associate_complete_wq(struct work_struct *work)
{
struct ieee80211_device *ieee = container_of(work, struct ieee80211_device, associate_complete_wq);
- printk(KERN_INFO "Associated successfully\n");
+ pr_info("Associated successfully\n");
if(ieee80211_is_54g(ieee->current_network) &&
(ieee->modulation & IEEE80211_OFDM_MODULATION)){
ieee->rate = 540;
- printk(KERN_INFO"Using G rates\n");
+ pr_info("Using G rates\n");
}else{
ieee->rate = 110;
- printk(KERN_INFO"Using B rates\n");
+ pr_info("Using B rates\n");
}
ieee->link_change(ieee->dev);
notify_wx_assoc_event(ieee);
@@ -1371,7 +1371,7 @@ inline void ieee80211_softmac_new_net(struct ieee80211_device *ieee, struct ieee
strncpy(ieee->current_network.ssid, tmp_ssid, IW_ESSID_MAX_SIZE);
ieee->current_network.ssid_len = tmp_ssid_len;
}
- printk(KERN_INFO"Linking with %s: channel is %d\n",ieee->current_network.ssid,ieee->current_network.channel);
+ pr_info("Linking with %s: channel is %d\n",ieee->current_network.ssid,ieee->current_network.channel);
if (ieee->iw_mode == IW_MODE_INFRA){
ieee->state = IEEE80211_ASSOCIATING;
@@ -1381,10 +1381,10 @@ inline void ieee80211_softmac_new_net(struct ieee80211_device *ieee, struct ieee
if(ieee80211_is_54g(ieee->current_network) &&
(ieee->modulation & IEEE80211_OFDM_MODULATION)){
ieee->rate = 540;
- printk(KERN_INFO"Using G rates\n");
+ pr_info("Using G rates\n");
}else{
ieee->rate = 110;
- printk(KERN_INFO"Using B rates\n");
+ pr_info("Using B rates\n");
}
ieee->state = IEEE80211_LINKED;
ieee->beinretry = false;
@@ -1573,7 +1573,7 @@ ieee80211_rx_assoc_rq(struct ieee80211_device *ieee, struct sk_buff *skb)
ieee80211_resp_to_assoc_rq(ieee, dest);
}
- printk(KERN_INFO"New client associated: "MAC_FMT"\n", MAC_ARG(dest));
+ pr_info("New client associated: "MAC_FMT"\n", MAC_ARG(dest));
}
@@ -1807,7 +1807,7 @@ ieee80211_rx_frame_softmac(struct ieee80211_device *ieee, struct sk_buff *skb,
ieee->assoc_id = aid;
ieee->softmac_stats.rx_ass_ok++;
- //printk(KERN_WARNING "nic_type = %s", (rx_stats->nic_type == 1)?"rtl8187":"rtl8187B");
+ //pr_warning("nic_type = %s", (rx_stats->nic_type == 1)?"rtl8187":"rtl8187B");
if(1 == rx_stats->nic_type) //card type is 8187
{
goto associate_complete;
@@ -1818,7 +1818,7 @@ ieee80211_rx_frame_softmac(struct ieee80211_device *ieee, struct sk_buff *skb,
while (left >= sizeof(struct ieee80211_info_element_hdr)) {
if (sizeof(struct ieee80211_info_element_hdr) + info_element->len > left) {
- printk(KERN_WARNING "[re]associate reeponse error!");
+ pr_warning("[re]associate reeponse error!");
return 1;
}
switch (info_element->id) {
@@ -2071,7 +2071,7 @@ void ieee80211_wake_queue(struct ieee80211_device *ieee)
else
ieee->seq_ctrl[0]++;
- //printk(KERN_ALERT "ieee80211_wake_queue \n");
+ //pr_alert("ieee80211_wake_queue \n");
ieee->softmac_data_hard_start_xmit(skb,ieee->dev,ieee->basic_rate);
dev_kfree_skb_any(skb);//edit by thomas
}
@@ -2251,7 +2251,7 @@ void ieee80211_start_ibss_wq(struct work_struct *work)
notify_wx_assoc_event(ieee);
ieee80211_start_send_beacons(ieee);
- printk(KERN_WARNING "after sending beacon packet!\n");
+ pr_warning("after sending beacon packet!\n");
if (ieee->data_hard_resume)
ieee->data_hard_resume(ieee->dev);
@@ -2768,7 +2768,7 @@ static int ieee80211_wpa_set_param(struct ieee80211_device *ieee, u8 name, u32 v
break;
case IEEE_PARAM_WPAX_SELECT:
// added for WPA2 mixed mode
- //printk(KERN_WARNING "------------------------>wpax value = %x\n", value);
+ //pr_warning("------------------------>wpax value = %x\n", value);
spin_lock_irqsave(&ieee->wpax_suitlist_lock,flags);
ieee->wpax_type_set = 1;
ieee->wpax_type_notify = value;
diff --git a/drivers/staging/rtl8187se/ieee80211/ieee80211_softmac_wx.c b/drivers/staging/rtl8187se/ieee80211/ieee80211_softmac_wx.c
index f1d6cb4..95b58b3 100644
--- a/drivers/staging/rtl8187se/ieee80211/ieee80211_softmac_wx.c
+++ b/drivers/staging/rtl8187se/ieee80211/ieee80211_softmac_wx.c
@@ -425,8 +425,8 @@ out:
else
ieee->raw_tx = 0;
- printk(KERN_INFO"raw TX is %s\n",
- ieee->raw_tx ? "enabled" : "disabled");
+ pr_info("raw TX is %s\n",
+ ieee->raw_tx ? "enabled" : "disabled");
if(ieee->iw_mode == IW_MODE_MONITOR)
{
diff --git a/drivers/staging/rtl8187se/ieee80211/ieee80211_tx.c b/drivers/staging/rtl8187se/ieee80211/ieee80211_tx.c
index e2945db..5ecf807 100644
--- a/drivers/staging/rtl8187se/ieee80211/ieee80211_tx.c
+++ b/drivers/staging/rtl8187se/ieee80211/ieee80211_tx.c
@@ -220,8 +220,8 @@ int ieee80211_encrypt_fragment(
atomic_dec(&crypt->refcnt);
if (res < 0) {
- printk(KERN_INFO "%s: Encryption failed: len=%d.\n",
- ieee->dev->name, frag->len);
+ pr_info("%s: Encryption failed: len=%d.\n",
+ ieee->dev->name, frag->len);
ieee->ieee_stats.tx_discards++;
return -1;
}
@@ -296,7 +296,7 @@ ieee80211_classify(struct sk_buff *skb, struct ieee80211_network *network)
u32 tag = vlan_tx_tag_get(skb);
wme_UP = (tag >> VLAN_PRI_SHIFT) & VLAN_PRI_MASK;
} else if(ETH_P_PAE == ntohs(((struct ethhdr *)skb->data)->h_proto)) {
- //printk(KERN_WARNING "type = normal packet\n");
+ //pr_warning("type = normal packet\n");
wme_UP = 7;
}
@@ -326,15 +326,15 @@ int ieee80211_xmit(struct sk_buff *skb,
struct ieee80211_crypt_data* crypt;
- //printk(KERN_WARNING "upper layer packet!\n");
+ //pr_warning("upper layer packet!\n");
spin_lock_irqsave(&ieee->lock, flags);
/* If there is no driver handler to take the TXB, dont' bother
* creating it... */
if ((!ieee->hard_start_xmit && !(ieee->softmac_features & IEEE_SOFTMAC_TX_QUEUE))||
((!ieee->softmac_data_hard_start_xmit && (ieee->softmac_features & IEEE_SOFTMAC_TX_QUEUE)))) {
- printk(KERN_WARNING "%s: No xmit handler.\n",
- ieee->dev->name);
+ pr_warning("%s: No xmit handler.\n",
+ ieee->dev->name);
goto success;
}
@@ -342,8 +342,8 @@ int ieee80211_xmit(struct sk_buff *skb,
if(likely(ieee->raw_tx == 0)){
if (unlikely(skb->len < SNAP_SIZE + sizeof(u16))) {
- printk(KERN_WARNING "%s: skb too small (%d).\n",
- ieee->dev->name, skb->len);
+ pr_warning("%s: skb too small (%d).\n",
+ ieee->dev->name, skb->len);
goto success;
}
@@ -408,7 +408,7 @@ int ieee80211_xmit(struct sk_buff *skb,
memcpy(&header.addr2, src, ETH_ALEN);
memcpy(&header.addr3, ieee->current_network.bssid, ETH_ALEN);
}
- // printk(KERN_WARNING "essid MAC address is "MAC_FMT, MAC_ARG(&header.addr1));
+ // pr_warning("essid MAC address is "MAC_FMT, MAC_ARG(&header.addr1));
header.frame_ctl = cpu_to_le16(fc);
//hdr_len = IEEE80211_3ADDR_LEN;
@@ -422,7 +422,7 @@ int ieee80211_xmit(struct sk_buff *skb,
qos_ctl = QOS_CTL_NOTCONTAIN_ACK;
}
else {
- //printk(KERN_WARNING "&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&frag_size = %d\n", frag_size);
+ //pr_warning("&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&frag_size = %d\n", frag_size);
frag_size = ieee->fts;//default:392
qos_ctl = 0;
}
@@ -465,8 +465,8 @@ int ieee80211_xmit(struct sk_buff *skb,
* postfix, header, FCS, etc.) */
txb = ieee80211_alloc_txb(nr_frags, frag_size, GFP_ATOMIC);
if (unlikely(!txb)) {
- printk(KERN_WARNING "%s: Could not allocate TXB\n",
- ieee->dev->name);
+ pr_warning("%s: Could not allocate TXB\n",
+ ieee->dev->name);
goto failed;
}
txb->encrypted = encrypt;
@@ -495,8 +495,8 @@ int ieee80211_xmit(struct sk_buff *skb,
if(ieee->current_network.QoS_Enable) {
// add 1 only indicate to corresponding seq number control 2006/7/12
frag_hdr->seq_ctl = cpu_to_le16(ieee->seq_ctrl[UP2AC(skb->priority)+1]<<4 | i);
- //printk(KERN_WARNING "skb->priority = %d,", skb->priority);
- //printk(KERN_WARNING "type:%d: seq = %d\n",UP2AC(skb->priority),ieee->seq_ctrl[UP2AC(skb->priority)+1]);
+ //pr_warning("skb->priority = %d,", skb->priority);
+ //pr_warning("type:%d: seq = %d\n",UP2AC(skb->priority),ieee->seq_ctrl[UP2AC(skb->priority)+1]);
} else {
frag_hdr->seq_ctl = cpu_to_le16(ieee->seq_ctrl[0]<<4 | i);
}
@@ -525,7 +525,7 @@ int ieee80211_xmit(struct sk_buff *skb,
skb_put(skb_frag, 4);
}
// Advance sequence number in data frame.
- //printk(KERN_WARNING "QoS Enalbed? %s\n", ieee->current_network.QoS_Enable?"Y":"N");
+ //pr_warning("QoS Enalbed? %s\n", ieee->current_network.QoS_Enable?"Y":"N");
if (ieee->current_network.QoS_Enable) {
if (ieee->seq_ctrl[UP2AC(skb->priority) + 1] == 0xFFF)
ieee->seq_ctrl[UP2AC(skb->priority) + 1] = 0;
@@ -540,15 +540,15 @@ int ieee80211_xmit(struct sk_buff *skb,
//---
}else{
if (unlikely(skb->len < sizeof(struct ieee80211_hdr_3addr))) {
- printk(KERN_WARNING "%s: skb too small (%d).\n",
- ieee->dev->name, skb->len);
+ pr_warning("%s: skb too small (%d).\n",
+ ieee->dev->name, skb->len);
goto success;
}
txb = ieee80211_alloc_txb(1, skb->len, GFP_ATOMIC);
if(!txb){
- printk(KERN_WARNING "%s: Could not allocate TXB\n",
- ieee->dev->name);
+ pr_warning("%s: Could not allocate TXB\n",
+ ieee->dev->name);
goto failed;
}
diff --git a/drivers/staging/rtl8187se/ieee80211/ieee80211_wx.c b/drivers/staging/rtl8187se/ieee80211/ieee80211_wx.c
index 8d8bdd0..d185bc0 100644
--- a/drivers/staging/rtl8187se/ieee80211/ieee80211_wx.c
+++ b/drivers/staging/rtl8187se/ieee80211/ieee80211_wx.c
@@ -343,9 +343,8 @@ int ieee80211_wx_set_encode(struct ieee80211_device *ieee,
kfree(new_crypt);
new_crypt = NULL;
- printk(KERN_WARNING "%s: could not initialize WEP: "
- "load module ieee80211_crypt_wep\n",
- dev->name);
+ pr_warning("%s: could not initialize WEP: load module ieee80211_crypt_wep\n",
+ dev->name);
return -EOPNOTSUPP;
}
*crypt = new_crypt;
--
1.6.5.rc3.dirty
_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
