From c713885a702dbffb62cfa6dd89c2a8dd3ab95576 Mon Sep 17 00:00:00 2001 From: YAMANE Toshiaki Date: Thu, 22 Nov 2012 09:06:50 +0900 Subject: [PATCH] --- yaml --- r: 338151 b: refs/heads/master c: ac8bc1235bc51035029d3212310c37123e51df6e h: refs/heads/master i: 338149: d6f073f72cb7454eef48d2c0e362edeeaf811c96 338147: db03a8829de7148aed1c5170a74d2f85f85d52c2 338143: c2fad149d08eb068b153a3332164adca83123e21 v: v3 --- [refs] | 2 +- trunk/drivers/staging/rtl8187se/r8180_core.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 0fd6f6f2a814..b09f065aee69 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5375819d83e54666e4552d1dab87ca6ce44c4600 +refs/heads/master: ac8bc1235bc51035029d3212310c37123e51df6e diff --git a/trunk/drivers/staging/rtl8187se/r8180_core.c b/trunk/drivers/staging/rtl8187se/r8180_core.c index 4d103495dc0c..e0414e509be6 100644 --- a/trunk/drivers/staging/rtl8187se/r8180_core.c +++ b/trunk/drivers/staging/rtl8187se/r8180_core.c @@ -1699,7 +1699,7 @@ void rtl8180_prepare_beacon(struct net_device *dev) * descriptor in the ring buffer, copyes the frame in a TX buffer * and kicks the NIC to ensure it does the DMA transfer. */ -short rtl8180_tx(struct net_device *dev, u8* txbuf, int len, int priority, +short rtl8180_tx(struct net_device *dev, u8 *txbuf, int len, int priority, short morefrag, short descfrag, int rate) { struct r8180_priv *priv = ieee80211_priv(dev); @@ -2211,7 +2211,7 @@ void rtl8180_watch_dog(struct net_device *dev); void watch_dog_adaptive(unsigned long data) { - struct r8180_priv* priv = ieee80211_priv((struct net_device *)data); + struct r8180_priv *priv = ieee80211_priv((struct net_device *)data); if (!priv->up) { DMESG("<----watch_dog_adaptive():driver is not up!\n"); @@ -3463,7 +3463,7 @@ void rtl8180_tx_isr(struct net_device *dev, int pri, short error) return ; } - nicv = (u32 *)((nic - nicbegin) + (u8*)begin); + nicv = (u32 *)((nic - nicbegin) + (u8 *)begin); if ((head <= tail && (nicv > tail || nicv < head)) || (head > tail && (nicv > tail && nicv < head))) { DMESGW("nic has lost pointer");