aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorStewart Malik <mali0037@gmail.com>2010-03-11 04:58:29 -0500
committerJohn W. Linville <linville@tuxdriver.com>2010-03-15 15:31:56 -0400
commit819cf15e7cde0a1b0fa4f831478f792434f55679 (patch)
tree989cad1495f211f845e348a67175e12c9210e2a4 /drivers/net
parent200763bb7503102aa364658e2b32cb2463a08d91 (diff)
DRIVER: Libertas: Fixed coding style in rx.c
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/wireless/libertas/rx.c50
1 files changed, 25 insertions, 25 deletions
diff --git a/drivers/net/wireless/libertas/rx.c b/drivers/net/wireless/libertas/rx.c
index 2daf8ffdb7e1..7a867e31ca5a 100644
--- a/drivers/net/wireless/libertas/rx.c
+++ b/drivers/net/wireless/libertas/rx.c
@@ -38,10 +38,10 @@ static int process_rxed_802_11_packet(struct lbs_private *priv,
38 struct sk_buff *skb); 38 struct sk_buff *skb);
39 39
40/** 40/**
41 * @brief This function computes the avgSNR . 41 * @brief This function computes the avgSNR .
42 * 42 *
43 * @param priv A pointer to struct lbs_private structure 43 * @param priv A pointer to struct lbs_private structure
44 * @return avgSNR 44 * @return avgSNR
45 */ 45 */
46static u8 lbs_getavgsnr(struct lbs_private *priv) 46static u8 lbs_getavgsnr(struct lbs_private *priv)
47{ 47{
@@ -56,10 +56,10 @@ static u8 lbs_getavgsnr(struct lbs_private *priv)
56} 56}
57 57
58/** 58/**
59 * @brief This function computes the AvgNF 59 * @brief This function computes the AvgNF
60 * 60 *
61 * @param priv A pointer to struct lbs_private structure 61 * @param priv A pointer to struct lbs_private structure
62 * @return AvgNF 62 * @return AvgNF
63 */ 63 */
64static u8 lbs_getavgnf(struct lbs_private *priv) 64static u8 lbs_getavgnf(struct lbs_private *priv)
65{ 65{
@@ -74,11 +74,11 @@ static u8 lbs_getavgnf(struct lbs_private *priv)
74} 74}
75 75
76/** 76/**
77 * @brief This function save the raw SNR/NF to our internel buffer 77 * @brief This function save the raw SNR/NF to our internel buffer
78 * 78 *
79 * @param priv A pointer to struct lbs_private structure 79 * @param priv A pointer to struct lbs_private structure
80 * @param prxpd A pointer to rxpd structure of received packet 80 * @param prxpd A pointer to rxpd structure of received packet
81 * @return n/a 81 * @return n/a
82 */ 82 */
83static void lbs_save_rawSNRNF(struct lbs_private *priv, struct rxpd *p_rx_pd) 83static void lbs_save_rawSNRNF(struct lbs_private *priv, struct rxpd *p_rx_pd)
84{ 84{
@@ -93,11 +93,11 @@ static void lbs_save_rawSNRNF(struct lbs_private *priv, struct rxpd *p_rx_pd)
93} 93}
94 94
95/** 95/**
96 * @brief This function computes the RSSI in received packet. 96 * @brief This function computes the RSSI in received packet.
97 * 97 *
98 * @param priv A pointer to struct lbs_private structure 98 * @param priv A pointer to struct lbs_private structure
99 * @param prxpd A pointer to rxpd structure of received packet 99 * @param prxpd A pointer to rxpd structure of received packet
100 * @return n/a 100 * @return n/a
101 */ 101 */
102static void lbs_compute_rssi(struct lbs_private *priv, struct rxpd *p_rx_pd) 102static void lbs_compute_rssi(struct lbs_private *priv, struct rxpd *p_rx_pd)
103{ 103{
@@ -134,9 +134,9 @@ static void lbs_compute_rssi(struct lbs_private *priv, struct rxpd *p_rx_pd)
134 * @brief This function processes received packet and forwards it 134 * @brief This function processes received packet and forwards it
135 * to kernel/upper layer 135 * to kernel/upper layer
136 * 136 *
137 * @param priv A pointer to struct lbs_private 137 * @param priv A pointer to struct lbs_private
138 * @param skb A pointer to skb which includes the received packet 138 * @param skb A pointer to skb which includes the received packet
139 * @return 0 or -1 139 * @return 0 or -1
140 */ 140 */
141int lbs_process_rxed_packet(struct lbs_private *priv, struct sk_buff *skb) 141int lbs_process_rxed_packet(struct lbs_private *priv, struct sk_buff *skb)
142{ 142{
@@ -196,7 +196,7 @@ int lbs_process_rxed_packet(struct lbs_private *priv, struct sk_buff *skb)
196 * before the snap_type. 196 * before the snap_type.
197 */ 197 */
198 p_ethhdr = (struct ethhdr *) 198 p_ethhdr = (struct ethhdr *)
199 ((u8 *) & p_rx_pkt->eth803_hdr 199 ((u8 *) &p_rx_pkt->eth803_hdr
200 + sizeof(p_rx_pkt->eth803_hdr) + sizeof(p_rx_pkt->rfc1042_hdr) 200 + sizeof(p_rx_pkt->eth803_hdr) + sizeof(p_rx_pkt->rfc1042_hdr)
201 - sizeof(p_rx_pkt->eth803_hdr.dest_addr) 201 - sizeof(p_rx_pkt->eth803_hdr.dest_addr)
202 - sizeof(p_rx_pkt->eth803_hdr.src_addr) 202 - sizeof(p_rx_pkt->eth803_hdr.src_addr)
@@ -213,7 +213,7 @@ int lbs_process_rxed_packet(struct lbs_private *priv, struct sk_buff *skb)
213 hdrchop = (u8 *)p_ethhdr - (u8 *)p_rx_pd; 213 hdrchop = (u8 *)p_ethhdr - (u8 *)p_rx_pd;
214 } else { 214 } else {
215 lbs_deb_hex(LBS_DEB_RX, "RX Data: LLC/SNAP", 215 lbs_deb_hex(LBS_DEB_RX, "RX Data: LLC/SNAP",
216 (u8 *) & p_rx_pkt->rfc1042_hdr, 216 (u8 *) &p_rx_pkt->rfc1042_hdr,
217 sizeof(p_rx_pkt->rfc1042_hdr)); 217 sizeof(p_rx_pkt->rfc1042_hdr));
218 218
219 /* Chop off the rxpd */ 219 /* Chop off the rxpd */
@@ -254,8 +254,8 @@ EXPORT_SYMBOL_GPL(lbs_process_rxed_packet);
254 * @brief This function converts Tx/Rx rates from the Marvell WLAN format 254 * @brief This function converts Tx/Rx rates from the Marvell WLAN format
255 * (see Table 2 in Section 3.1) to IEEE80211_RADIOTAP_RATE units (500 Kb/s) 255 * (see Table 2 in Section 3.1) to IEEE80211_RADIOTAP_RATE units (500 Kb/s)
256 * 256 *
257 * @param rate Input rate 257 * @param rate Input rate
258 * @return Output Rate (0 if invalid) 258 * @return Output Rate (0 if invalid)
259 */ 259 */
260static u8 convert_mv_rate_to_radiotap(u8 rate) 260static u8 convert_mv_rate_to_radiotap(u8 rate)
261{ 261{
@@ -294,9 +294,9 @@ static u8 convert_mv_rate_to_radiotap(u8 rate)
294 * @brief This function processes a received 802.11 packet and forwards it 294 * @brief This function processes a received 802.11 packet and forwards it
295 * to kernel/upper layer 295 * to kernel/upper layer
296 * 296 *
297 * @param priv A pointer to struct lbs_private 297 * @param priv A pointer to struct lbs_private
298 * @param skb A pointer to skb which includes the received packet 298 * @param skb A pointer to skb which includes the received packet
299 * @return 0 or -1 299 * @return 0 or -1
300 */ 300 */
301static int process_rxed_802_11_packet(struct lbs_private *priv, 301static int process_rxed_802_11_packet(struct lbs_private *priv,
302 struct sk_buff *skb) 302 struct sk_buff *skb)
@@ -313,7 +313,7 @@ static int process_rxed_802_11_packet(struct lbs_private *priv,
313 p_rx_pkt = (struct rx80211packethdr *) skb->data; 313 p_rx_pkt = (struct rx80211packethdr *) skb->data;
314 prxpd = &p_rx_pkt->rx_pd; 314 prxpd = &p_rx_pkt->rx_pd;
315 315
316 // lbs_deb_hex(LBS_DEB_RX, "RX Data: Before chop rxpd", skb->data, min(skb->len, 100)); 316 /* lbs_deb_hex(LBS_DEB_RX, "RX Data: Before chop rxpd", skb->data, min(skb->len, 100)); */
317 317
318 if (skb->len < (ETH_HLEN + 8 + sizeof(struct rxpd))) { 318 if (skb->len < (ETH_HLEN + 8 + sizeof(struct rxpd))) {
319 lbs_deb_rx("rx err: frame received with bad length\n"); 319 lbs_deb_rx("rx err: frame received with bad length\n");