Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 289248
b: refs/heads/master
c: 24a39f7
h: refs/heads/master
v: v3
  • Loading branch information
Andrew Miller authored and Greg Kroah-Hartman committed Mar 14, 2012
1 parent 89f3676 commit f0ff24f
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 7 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: cd6868080efcef7df4ffef860b54994be6d268a9
refs/heads/master: 24a39f702b0f5a997018c76b7730bb416a53e7bb
11 changes: 5 additions & 6 deletions trunk/drivers/staging/rtl8187se/r8180_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -439,8 +439,7 @@ void buffer_free(struct net_device *dev, struct buffer **buffer, int len, short
}
kfree(tmp);
tmp = next;
}
while (next != *buffer);
} while (next != *buffer);

*buffer = NULL;
}
Expand Down Expand Up @@ -1618,9 +1617,9 @@ void rtl8180_rx(struct net_device *dev)
if (IEEE80211_FTYPE_CTL != type &&
!bHwError && !bCRC && !bICV &&
eqMacAddr(priv->ieee80211->current_network.bssid,
fc & IEEE80211_FCTL_TODS ? hdr->addr1 :
fc & IEEE80211_FCTL_FROMDS ? hdr->addr2 :
hdr->addr3)) {
fc & IEEE80211_FCTL_TODS ? hdr->addr1 :
fc & IEEE80211_FCTL_FROMDS ? hdr->addr2 :
hdr->addr3)) {

/* Perform signal smoothing for dynamic
* mechanism on demand. This is different
Expand Down Expand Up @@ -3736,7 +3735,7 @@ static int __init rtl8180_pci_module_init(void)
DMESG("Wireless extensions version %d", WIRELESS_EXT);
rtl8180_proc_module_init();

if (pci_register_driver(&rtl8180_pci_driver)) {
if (pci_register_driver(&rtl8180_pci_driver)) {
DMESG("No device found");
return -ENODEV;
}
Expand Down

0 comments on commit f0ff24f

Please sign in to comment.