Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 228062
b: refs/heads/master
c: 6f71090
h: refs/heads/master
v: v3
  • Loading branch information
Johan Meiring authored and Greg Kroah-Hartman committed Nov 10, 2010
1 parent 413ac60 commit b911414
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 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: 869c4b4a715af94a14ec074c0a5528a562e3322b
refs/heads/master: 6f710907ff452ab67bd1161bc3f7a95f9a7e809d
6 changes: 4 additions & 2 deletions trunk/drivers/staging/wlan-ng/p80211netdev.c
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,8 @@ static void p80211netdev_rx_bh(unsigned long arg)
if (memcmp
(hdr->a1, wlandev->netdev->dev_addr,
ETH_ALEN) != 0) {
/* but reject anything else that isn't multicast */
/* but reject anything else that
isn't multicast */
if (!(hdr->a1[0] & 0x01)) {
dev_kfree_skb(skb);
continue;
Expand Down Expand Up @@ -770,7 +771,8 @@ int wlan_setup(wlandevice_t *wlandev, struct device *physdev)
}

/* Allocate and initialize the struct device */
netdev = alloc_netdev(sizeof(struct wireless_dev), "wlan%d", ether_setup);
netdev = alloc_netdev(sizeof(struct wireless_dev), "wlan%d",
ether_setup);
if (netdev == NULL) {
printk(KERN_ERR "Failed to alloc netdev.\n");
wlan_free_wiphy(wiphy);
Expand Down

0 comments on commit b911414

Please sign in to comment.