Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 338151
b: refs/heads/master
c: ac8bc12
h: refs/heads/master
i:
  338149: d6f073f
  338147: db03a88
  338143: c2fad14
v: v3
  • Loading branch information
YAMANE Toshiaki authored and Greg Kroah-Hartman committed Nov 27, 2012
1 parent 91d9bfe commit c713885
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 5375819d83e54666e4552d1dab87ca6ce44c4600
refs/heads/master: ac8bc1235bc51035029d3212310c37123e51df6e
6 changes: 3 additions & 3 deletions trunk/drivers/staging/rtl8187se/r8180_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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");
Expand Down Expand Up @@ -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");
Expand Down

0 comments on commit c713885

Please sign in to comment.