evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

drivers: staging: rtl8187se: wrap excessively long lines

Browse source 
Signed-off-by: Axel Rasmussen <axel.rasmussen1@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Axel Rasmussen 2014-03-04 00:12:51 -07:00 • committed by Greg Kroah-Hartman
parent 6c76aab5bd
commit 3187fcbb2a
1 changed files with 26 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
drivers/staging/rtl8187se/r8180_core.c
View file

@ -258,7 +258,9 @@ static int proc_get_stats_tx(struct seq_file *m, void *v)
struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv(dev); struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv(dev);
unsigned long totalOK; unsigned long totalOK;
totalOK = priv->stats.txnpokint+priv->stats.txhpokint+priv->stats.txlpokint; totalOK = priv->stats.txnpokint + priv->stats.txhpokint +
priv->stats.txlpokint;
seq_printf(m, seq_printf(m,
"TX OK: %lu\n" "TX OK: %lu\n"
"TX Error: %lu\n" "TX Error: %lu\n"
@ -468,9 +470,11 @@ static short check_nic_enought_desc(struct net_device *dev, int priority)
{ {
struct r8180_priv *priv = ieee80211_priv(dev); struct r8180_priv *priv = ieee80211_priv(dev);
struct ieee80211_device *ieee = netdev_priv(dev); struct ieee80211_device *ieee = netdev_priv(dev);
int requiredbyte, required; int requiredbyte;
int required;
requiredbyte = priv->ieee80211->fts + sizeof(struct ieee80211_header_data); requiredbyte = priv->ieee80211->fts +
sizeof(struct ieee80211_header_data);
if (ieee->current_network.QoS_Enable) if (ieee->current_network.QoS_Enable)
requiredbyte += 2; requiredbyte += 2;
@ -484,7 +488,7 @@ static short check_nic_enought_desc(struct net_device *dev, int priority)
* between the tail and the head * between the tail and the head
*/ */
return (required+2 < get_curr_tx_free_desc(dev, priority)); return required + 2 < get_curr_tx_free_desc(dev, priority);
} }
void fix_tx_fifo(struct net_device *dev) void fix_tx_fifo(struct net_device *dev)
@ -742,43 +746,50 @@ static short alloc_tx_desc_ring(struct net_device *dev, int bufsize, int count,
switch (addr) { switch (addr) {
case TX_MANAGEPRIORITY_RING_ADDR: case TX_MANAGEPRIORITY_RING_ADDR:
if (-1 == buffer_add(&(priv->txmapbufs), buf, dma_tmp, NULL)) { if (-1 == buffer_add(&priv->txmapbufs,
buf, dma_tmp, NULL)) {
DMESGE("Unable to allocate mem for buffer NP"); DMESGE("Unable to allocate mem for buffer NP");
return -ENOMEM; return -ENOMEM;
} }
break; break;
case TX_BKPRIORITY_RING_ADDR: case TX_BKPRIORITY_RING_ADDR:
if (-1 == buffer_add(&(priv->txbkpbufs), buf, dma_tmp, NULL)) { if (-1 == buffer_add(&priv->txbkpbufs,
buf, dma_tmp, NULL)) {
DMESGE("Unable to allocate mem for buffer LP"); DMESGE("Unable to allocate mem for buffer LP");
return -ENOMEM; return -ENOMEM;
} }
break; break;
case TX_BEPRIORITY_RING_ADDR: case TX_BEPRIORITY_RING_ADDR:
if (-1 == buffer_add(&(priv->txbepbufs), buf, dma_tmp, NULL)) { if (-1 == buffer_add(&priv->txbepbufs,
buf, dma_tmp, NULL)) {
DMESGE("Unable to allocate mem for buffer NP"); DMESGE("Unable to allocate mem for buffer NP");
return -ENOMEM; return -ENOMEM;
} }
break; break;
case TX_VIPRIORITY_RING_ADDR: case TX_VIPRIORITY_RING_ADDR:
if (-1 == buffer_add(&(priv->txvipbufs), buf, dma_tmp, NULL)) { if (-1 == buffer_add(&priv->txvipbufs,
buf, dma_tmp, NULL)) {
DMESGE("Unable to allocate mem for buffer LP"); DMESGE("Unable to allocate mem for buffer LP");
return -ENOMEM; return -ENOMEM;
} }
break; break;
case TX_VOPRIORITY_RING_ADDR: case TX_VOPRIORITY_RING_ADDR:
if (-1 == buffer_add(&(priv->txvopbufs), buf, dma_tmp, NULL)) { if (-1 == buffer_add(&priv->txvopbufs,
buf, dma_tmp, NULL)) {
DMESGE("Unable to allocate mem for buffer NP"); DMESGE("Unable to allocate mem for buffer NP");
return -ENOMEM; return -ENOMEM;
} }
break; break;
case TX_HIGHPRIORITY_RING_ADDR: case TX_HIGHPRIORITY_RING_ADDR:
if (-1 == buffer_add(&(priv->txhpbufs), buf, dma_tmp, NULL)) { if (-1 == buffer_add(&priv->txhpbufs,
buf, dma_tmp, NULL)) {
DMESGE("Unable to allocate mem for buffer HP"); DMESGE("Unable to allocate mem for buffer HP");
return -ENOMEM; return -ENOMEM;
} }
break; break;
case TX_BEACON_RING_ADDR: case TX_BEACON_RING_ADDR:
if (-1 == buffer_add(&(priv->txbeaconbufs), buf, dma_tmp, NULL)) { if (-1 == buffer_add(&priv->txbeaconbufs,
buf, dma_tmp, NULL)) {
DMESGE("Unable to allocate mem for buffer BP"); DMESGE("Unable to allocate mem for buffer BP");
return -ENOMEM; return -ENOMEM;
} }
@ -897,8 +908,8 @@ static short alloc_rx_desc_ring(struct net_device *dev, u16 bufsize, int count)
return -1; return -1;
} }
desc = (u32 *)pci_alloc_consistent(pdev, sizeof(u32)*rx_desc_size*count+256, desc = (u32 *)pci_alloc_consistent(pdev,
&dma_desc); sizeof(u32) * rx_desc_size * count + 256, &dma_desc);
if (dma_desc & 0xff) if (dma_desc & 0xff)
/* /*
@ -935,7 +946,8 @@ static short alloc_rx_desc_ring(struct net_device *dev, u16 bufsize, int count)
tmp = tmp+rx_desc_size; tmp = tmp+rx_desc_size;
} }
*(tmp-rx_desc_size) = *(tmp-rx_desc_size) | (1<<30); /* this is the last descriptor */ /* this is the last descriptor */
*(tmp - rx_desc_size) = *(tmp - rx_desc_size) | (1 << 30);
return 0; return 0;
} }