Commit 3e0ca2f1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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_
parents c7659e2c 529d303e

drivers/net/sky2.c

+0 −3
Original line number Diff line number Diff line
@@ -2163,9 +2163,6 @@ static struct sk_buff *sky2_receive(struct net_device *dev, 
	sky2->rx_next = (sky2->rx_next + 1) % sky2->rx_pending;

	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.

	 * So do only marginal checking and expect higher level protocols

	 * to handle crap frames.

drivers/net/wireless/bcm43xx/bcm43xx_wx.c

+1 −1
Original line number Diff line number Diff line
@@ -444,7 +444,7 @@ static int bcm43xx_wx_set_xmitpower(struct net_device *net_dev, 
	u16 maxpower;



	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;

	}

net/ieee80211/softmac/ieee80211softmac_wx.c

+1 −1
Original line number Diff line number Diff line
@@ -114,7 +114,7 @@ ieee80211softmac_wx_set_essid(struct net_device *net_dev, 
	sm->associnfo.associating = 1;

	/* queue lower level code to do work (if necessary) */

	schedule_delayed_work(&sm->associnfo.work, 0);

out:



	mutex_unlock(&sm->associnfo.mutex);



	return 0;