hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 

* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6:
  sky2: jumbo frame regression fix
  [PATCH] softmac: Fix compiler-warning
  [PATCH] bcm43xx: Correct printk with PFX before KERN_
This commit is contained in:
Linus Torvalds 2007-10-03 15:43:36 -07:00
parent c7659e2c13 529d303e07
commit 3e0ca2f148
3 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/net/sky2.c
View File

@ -2163,9 +2163,6 @@ static struct sk_buff *sky2_receive(struct net_device *dev,
sky2->rx_next = (sky2->rx_next + 1) % sky2->rx_pending; sky2->rx_next = (sky2->rx_next + 1) % sky2->rx_pending;
prefetch(sky2->rx_ring + sky2->rx_next); prefetch(sky2->rx_ring + sky2->rx_next);
if (length < ETH_ZLEN || length > sky2->rx_data_size)
goto len_error;
/* This chip has hardware problems that generates bogus status. /* This chip has hardware problems that generates bogus status.
* So do only marginal checking and expect higher level protocols * So do only marginal checking and expect higher level protocols
* to handle crap frames. * to handle crap frames.

2
drivers/net/wireless/bcm43xx/bcm43xx_wx.c
View File

@ -444,7 +444,7 @@ static int bcm43xx_wx_set_xmitpower(struct net_device *net_dev,
u16 maxpower; u16 maxpower;
if ((data->txpower.flags & IW_TXPOW_TYPE) != IW_TXPOW_DBM) { if ((data->txpower.flags & IW_TXPOW_TYPE) != IW_TXPOW_DBM) {
printk(PFX KERN_ERR "TX power not in dBm.\n"); printk(KERN_ERR PFX "TX power not in dBm.\n");
return -EOPNOTSUPP; return -EOPNOTSUPP;
} }

2
net/ieee80211/softmac/ieee80211softmac_wx.c
View File

@ -114,7 +114,7 @@ check_assoc_again:
sm->associnfo.associating = 1; sm->associnfo.associating = 1;
/* queue lower level code to do work (if necessary) */ /* queue lower level code to do work (if necessary) */
schedule_delayed_work(&sm->associnfo.work, 0); schedule_delayed_work(&sm->associnfo.work, 0);
out:
mutex_unlock(&sm->associnfo.mutex); mutex_unlock(&sm->associnfo.mutex);
return 0; return 0;