All of lore.kernel.org
 help / color / mirror / Atom feed
* linux-next: manual merge of the net tree with the net-current tree
@ 2009-11-23  1:00 ` Stephen Rothwell
  0 siblings, 0 replies; 116+ messages in thread
From: Stephen Rothwell @ 2009-11-23  1:00 UTC (permalink / raw)
  To: David Miller, netdev; +Cc: linux-next, linux-kernel, Amit Kumar Salecha

Hi all,

Today's linux-next merge of the net tree got a conflict in
drivers/net/netxen/netxen_nic_init.c between commit
5d521fd36de4e61ab16a358df54c5babe153396c ("netxen: fix memory
initialization") from the net-current tree and commit
0be367bd5d10634c0836f57a684432fee935d929 ("netxen: reset sequence
changes") from the net tree.

Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/net/netxen/netxen_nic_init.c
index 8a09043,6ee27a6..0000000
--- a/drivers/net/netxen/netxen_nic_init.c
+++ b/drivers/net/netxen/netxen_nic_init.c
@@@ -544,9 -528,8 +528,10 @@@ int netxen_pinit_from_rom(struct netxen
  				continue;
  			if (off == (ROMUSB_GLB + 0x1c)) /* MS clock */
  				continue;
 +			if ((off & 0x0ff00000) == NETXEN_CRB_DDR_NET)
 +				continue;
- 			if (off == (NETXEN_CRB_PEG_NET_1 + 0x18))
+ 			if (off == (NETXEN_CRB_PEG_NET_1 + 0x18) &&
+ 				!NX_IS_REVISION_P3P(adapter->ahw.revision_id))
  				buf[i].data = 0x1020;
  			/* skip the function enable register */
  			if (off == NETXEN_PCIE_REG(PCIE_SETUP_FUNCTION))

^ permalink raw reply	[flat|nested] 116+ messages in thread
* linux-next: manual merge of the net tree with the net-current tree
@ 2011-09-28  2:54 ` Stephen Rothwell
  0 siblings, 0 replies; 116+ messages in thread
From: Stephen Rothwell @ 2011-09-28  2:54 UTC (permalink / raw)
  To: David Miller, netdev
  Cc: linux-next, linux-kernel, Antonio Quartulli, Marek Lindner

Hi all,

Today's linux-next merge of the net tree got a conflict in
net/batman-adv/soft-interface.c between commit 8b267b312df9 ("batman-adv:
do_bcast has to be true for broadcast packets only") from the net-current
tree and commit 3d393e473210 ("batman-adv: implement AP-isolation on the
sender side") from the net tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc net/batman-adv/soft-interface.c
index 05dd351,aceeabc..0000000
--- a/net/batman-adv/soft-interface.c
+++ b/net/batman-adv/soft-interface.c
@@@ -595,11 -596,12 +596,12 @@@ static int interface_tx(struct sk_buff 
  		goto dropped;
  
  	/* Register the client MAC in the transtable */
- 	tt_local_add(soft_iface, ethhdr->h_source);
+ 	tt_local_add(soft_iface, ethhdr->h_source, skb->skb_iif);
  
- 	orig_node = transtable_search(bat_priv, ethhdr->h_dest);
+ 	orig_node = transtable_search(bat_priv, ethhdr->h_source,
+ 				      ethhdr->h_dest);
 -	if (is_multicast_ether_addr(ethhdr->h_dest) ||
 -				(orig_node && orig_node->gw_flags)) {
 +	do_bcast = is_multicast_ether_addr(ethhdr->h_dest);
 +	if (do_bcast ||	(orig_node && orig_node->gw_flags)) {
  		ret = gw_is_target(bat_priv, skb, orig_node);
  
  		if (ret < 0)

^ permalink raw reply	[flat|nested] 116+ messages in thread
* linux-next: manual merge of the net tree with the net-current tree
@ 2011-06-20  2:56 ` Stephen Rothwell
  0 siblings, 0 replies; 116+ messages in thread
From: Stephen Rothwell @ 2011-06-20  2:56 UTC (permalink / raw)
  To: David Miller, netdev
  Cc: linux-next, linux-kernel, Hans Schillstrom, Simon Horman

Hi all,

Today's linux-next merge of the net tree got a conflict in
net/netfilter/ipvs/ip_vs_core.c between commit 8f4e0a18682d ("IPVS netns
exit causes crash in conntrack") from the net-current tree and commit
503cf15a5ecc ("IPVS: rename of netns init and cleanup functions") from
the net tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc net/netfilter/ipvs/ip_vs_core.c
index 24c28d2,2200bae..0000000
--- a/net/netfilter/ipvs/ip_vs_core.c
+++ b/net/netfilter/ipvs/ip_vs_core.c
@@@ -1945,8 -1945,7 +1945,8 @@@ static void __net_exit __ip_vs_dev_clea
  {
  	EnterFunction(2);
  	net_ipvs(net)->enable = 0;	/* Disable packet reception */
 +	smp_wmb();
- 	__ip_vs_sync_cleanup(net);
+ 	ip_vs_sync_net_cleanup(net);
  	LeaveFunction(2);
  }
  

^ permalink raw reply	[flat|nested] 116+ messages in thread
* linux-next: manual merge of the net tree with the net-current tree
@ 2011-05-17  2:01 ` Stephen Rothwell
  0 siblings, 0 replies; 116+ messages in thread
From: Stephen Rothwell @ 2011-05-17  2:01 UTC (permalink / raw)
  To: David Miller, netdev
  Cc: linux-next, linux-kernel, Thomas Jarosch,
	"Michał Mirosław"

[-- Attachment #1: Type: text/plain, Size: 493 bytes --]

Hi all,

Today's linux-next merge of the net tree got a conflict in
drivers/net/vmxnet3/vmxnet3_ethtool.c between commit ebde6f8acba9
("vmxnet3: Fix inconsistent LRO state after initialization") from the
net-current tree and commit a0d2730c9571 ("net: vmxnet3: convert to
hw_features") from the net tree.

I fixed it up (by removing the lines added by the net-current patch) and
can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]

^ permalink raw reply	[flat|nested] 116+ messages in thread
* linux-next: manual merge of the net tree with the net-current tree
@ 2011-05-10  1:49 ` Stephen Rothwell
  0 siblings, 0 replies; 116+ messages in thread
From: Stephen Rothwell @ 2011-05-10  1:49 UTC (permalink / raw)
  To: David Miller, netdev
  Cc: linux-next, linux-kernel, Somnath Kotur, Sathya Perla

Hi all,

Today's linux-next merge of the net tree got a conflict in
drivers/net/benet/be_main.c between commit 6709d9521df0 ("be2net: Fixed
bugs related to PVID") from the net-current tree and commit 15d721847f56
("be2net: parse vid and vtm fields of rx-compl only if vlanf bit is set")
from the net tree.

I fixed it up (I think - see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/net/benet/be_main.c
index 9187fb4,7b19931..0000000
--- a/drivers/net/benet/be_main.c
+++ b/drivers/net/benet/be_main.c
@@@ -1103,9 -1102,14 +1104,14 @@@ static void be_parse_rx_compl_v1(struc
  		AMAP_GET_BITS(struct amap_eth_rx_compl_v1, numfrags, compl);
  	rxcp->pkt_type =
  		AMAP_GET_BITS(struct amap_eth_rx_compl_v1, cast_enc, compl);
- 	rxcp->vtm = AMAP_GET_BITS(struct amap_eth_rx_compl_v1, vtm, compl);
- 	rxcp->vlan_tag = AMAP_GET_BITS(struct amap_eth_rx_compl_v1, vlan_tag,
- 					compl);
+ 	rxcp->rss_hash =
+ 		AMAP_GET_BITS(struct amap_eth_rx_compl_v1, rsshash, rxcp);
+ 	if (rxcp->vlanf) {
+ 		rxcp->vtm = AMAP_GET_BITS(struct amap_eth_rx_compl_v1, vtm,
+ 				compl);
 -		rxcp->vid = AMAP_GET_BITS(struct amap_eth_rx_compl_v1, vlan_tag,
++		rxcp->vlan_tag = AMAP_GET_BITS(struct amap_eth_rx_compl_v1, vlan_tag,
+ 				compl);
+ 	}
  }
  
  static void be_parse_rx_compl_v0(struct be_adapter *adapter,
@@@ -1130,9 -1134,14 +1136,14 @@@
  		AMAP_GET_BITS(struct amap_eth_rx_compl_v0, numfrags, compl);
  	rxcp->pkt_type =
  		AMAP_GET_BITS(struct amap_eth_rx_compl_v0, cast_enc, compl);
- 	rxcp->vtm = AMAP_GET_BITS(struct amap_eth_rx_compl_v0, vtm, compl);
- 	rxcp->vlan_tag = AMAP_GET_BITS(struct amap_eth_rx_compl_v0, vlan_tag,
- 					compl);
+ 	rxcp->rss_hash =
+ 		AMAP_GET_BITS(struct amap_eth_rx_compl_v0, rsshash, rxcp);
+ 	if (rxcp->vlanf) {
+ 		rxcp->vtm = AMAP_GET_BITS(struct amap_eth_rx_compl_v0, vtm,
+ 				compl);
 -		rxcp->vid = AMAP_GET_BITS(struct amap_eth_rx_compl_v0, vlan_tag,
++		rxcp->vlan_tag = AMAP_GET_BITS(struct amap_eth_rx_compl_v0, vlan_tag,
+ 				compl);
+ 	}
  }
  
  static struct be_rx_compl_info *be_rx_compl_get(struct be_rx_obj *rxo)
@@@ -1154,17 -1163,19 +1165,20 @@@
  	else
  		be_parse_rx_compl_v0(adapter, compl, rxcp);
  
- 	/* vlanf could be wrongly set in some cards. ignore if vtm is not set */
- 	if ((adapter->function_mode & 0x400) && !rxcp->vtm)
- 		rxcp->vlanf = 0;
+ 	if (rxcp->vlanf) {
+ 		/* vlanf could be wrongly set in some cards.
+ 		 * ignore if vtm is not set */
+ 		if ((adapter->function_mode & 0x400) && !rxcp->vtm)
+ 			rxcp->vlanf = 0;
  
- 	if (!lancer_chip(adapter))
- 		rxcp->vlan_tag = swab16(rxcp->vlan_tag);
+ 		if (!lancer_chip(adapter))
 -			rxcp->vid = swab16(rxcp->vid);
++			rxcp->vlan_tag = swab16(rxcp->vlan_tag);
  
- 	if (((adapter->pvid & VLAN_VID_MASK) ==
- 		(rxcp->vlan_tag & VLAN_VID_MASK)) &&
- 		!adapter->vlan_tag[rxcp->vlan_tag])
- 		rxcp->vlanf = 0;
 -		if ((adapter->pvid == rxcp->vid) &&
 -			!adapter->vlan_tag[rxcp->vid])
++		if (((adapter->pvid & VLAN_VID_MASK) ==
++			(rxcp->vlan_tag & VLAN_VID_MASK)) &&
++			!adapter->vlan_tag[rxcp->vlan_tag])
+ 			rxcp->vlanf = 0;
+ 	}
  
  	/* As the compl has been parsed, reset it; we wont touch it again */
  	compl->dw[offsetof(struct amap_eth_rx_compl_v1, valid) / 32] = 0;

^ permalink raw reply	[flat|nested] 116+ messages in thread
* linux-next: manual merge of the net tree with the net-current tree
@ 2011-05-03  3:15 ` Stephen Rothwell
  0 siblings, 0 replies; 116+ messages in thread
From: Stephen Rothwell @ 2011-05-03  3:15 UTC (permalink / raw)
  To: David Miller, netdev
  Cc: linux-next, linux-kernel, Rafael J. Wysocki, Joe Perches

Hi all,

Today's linux-next merge of the net tree got a conflict in
drivers/net/tg3.c between commit 6fdbab9d93e0 ("tg3: Fix failure to
enable WoL by default when possible") from the net-current tree and
commit 63c3a66fe6c8 ("tg3: Convert u32 flag,flg2,flg3 uses to bitmap")
from the net tree.

Context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/net/tg3.c
index 7a5daef,7c7c9a8..0000000
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@@ -12325,12 -12745,10 +12745,12 @@@ static void __devinit tg3_get_eeprom_hw
  		}
  		val = tr32(VCPU_CFGSHDW);
  		if (val & VCPU_CFGSHDW_ASPM_DBNC)
- 			tp->tg3_flags |= TG3_FLAG_ASPM_WORKAROUND;
+ 			tg3_flag_set(tp, ASPM_WORKAROUND);
  		if ((val & VCPU_CFGSHDW_WOL_ENABLE) &&
 -		    (val & VCPU_CFGSHDW_WOL_MAGPKT))
 +		    (val & VCPU_CFGSHDW_WOL_MAGPKT)) {
- 			tp->tg3_flags |= TG3_FLAG_WOL_ENABLE;
+ 			tg3_flag_set(tp, WOL_ENABLE);
 +			device_set_wakeup_enable(&tp->pdev->dev, true);
 +		}
  		goto done;
  	}
  
@@@ -12460,13 -12878,11 +12880,13 @@@
  
  		if (tp->phy_flags & TG3_PHYFLG_ANY_SERDES &&
  		    !(nic_cfg & NIC_SRAM_DATA_CFG_FIBER_WOL))
- 			tp->tg3_flags &= ~TG3_FLAG_WOL_CAP;
+ 			tg3_flag_clear(tp, WOL_CAP);
  
- 		if ((tp->tg3_flags & TG3_FLAG_WOL_CAP) &&
+ 		if (tg3_flag(tp, WOL_CAP) &&
 -		    (nic_cfg & NIC_SRAM_DATA_CFG_WOL_ENABLE))
 +		    (nic_cfg & NIC_SRAM_DATA_CFG_WOL_ENABLE)) {
- 			tp->tg3_flags |= TG3_FLAG_WOL_ENABLE;
+ 			tg3_flag_set(tp, WOL_ENABLE);
 +			device_set_wakeup_enable(&tp->pdev->dev, true);
 +		}
  
  		if (cfg2 & (1 << 17))
  			tp->phy_flags |= TG3_PHYFLG_CAPACITIVE_COUPLING;

^ permalink raw reply	[flat|nested] 116+ messages in thread
* linux-next: manual merge of the net tree with the net-current tree
@ 2011-04-19  3:16 ` Stephen Rothwell
  0 siblings, 0 replies; 116+ messages in thread
From: Stephen Rothwell @ 2011-04-19  3:16 UTC (permalink / raw)
  To: David Miller, netdev
  Cc: linux-next, linux-kernel, Yaniv Rosner, stephen hemminger

Hi all,

Today's linux-next merge of the net tree got a conflict in
drivers/net/bnx2x/bnx2x_ethtool.c between commit 70dda99c41fc ("bnx2x:
Fix port identification problem") from the net-current tree and commit
32d3613475d8 ("bnx2x: convert to set_phys_id") from the net tree.

I fixed it up (maybe - see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/net/bnx2x/bnx2x_ethtool.c
index 89cb977,e711a22..0000000
--- a/drivers/net/bnx2x/bnx2x_ethtool.c
+++ b/drivers/net/bnx2x/bnx2x_ethtool.c
@@@ -2097,35 -2013,38 +2013,36 @@@ static void bnx2x_get_ethtool_stats(str
  	}
  }
  
- static int bnx2x_phys_id(struct net_device *dev, u32 data)
+ static int bnx2x_set_phys_id(struct net_device *dev,
+ 			     enum ethtool_phys_id_state state)
  {
  	struct bnx2x *bp = netdev_priv(dev);
- 	int i;
  
  	if (!netif_running(dev))
- 		return 0;
+ 		return -EAGAIN;
  
  	if (!bp->port.pmf)
- 		return 0;
+ 		return -EOPNOTSUPP;
  
- 	if (data == 0)
- 		data = 2;
+ 	switch (state) {
+ 	case ETHTOOL_ID_ACTIVE:
+ 		return 1;	/* cycle on/off once per second */
  
- 	for (i = 0; i < (data * 2); i++) {
- 		if ((i % 2) == 0)
- 			bnx2x_set_led(&bp->link_params, &bp->link_vars,
- 				      LED_MODE_ON, SPEED_1000);
- 		else
- 			bnx2x_set_led(&bp->link_params, &bp->link_vars,
- 				      LED_MODE_FRONT_PANEL_OFF, 0);
+ 	case ETHTOOL_ID_ON:
+ 		bnx2x_set_led(&bp->link_params, &bp->link_vars,
 -			      LED_MODE_OPER, SPEED_1000);
++			      LED_MODE_ON, SPEED_1000);
+ 		break;
  
- 		msleep_interruptible(500);
- 		if (signal_pending(current))
- 			break;
- 	}
+ 	case ETHTOOL_ID_OFF:
+ 		bnx2x_set_led(&bp->link_params, &bp->link_vars,
 -			      LED_MODE_OFF, 0);
++			      LED_MODE_FRONT_PANEL_OFF, 0);
+ 
+ 		break;
  
- 	bnx2x_set_led(&bp->link_params, &bp->link_vars,
- 		      LED_MODE_OPER, bp->link_vars.line_speed);
+ 	case ETHTOOL_ID_INACTIVE:
 -		if (bp->link_vars.link_up)
 -			bnx2x_set_led(&bp->link_params, &bp->link_vars,
 -				      LED_MODE_OPER,
 -				      bp->link_vars.line_speed);
++		bnx2x_set_led(&bp->link_params, &bp->link_vars,
++			      LED_MODE_OPER, bp->link_vars.line_speed);
+ 	}
  
  	return 0;
  }

^ permalink raw reply	[flat|nested] 116+ messages in thread
* linux-next: manual merge of the net tree with the net-current tree
@ 2011-04-07  1:39 ` Stephen Rothwell
  0 siblings, 0 replies; 116+ messages in thread
From: Stephen Rothwell @ 2011-04-07  1:39 UTC (permalink / raw)
  To: David Miller, netdev
  Cc: linux-next, linux-kernel, Sathya Perla, Ajit Khaparde

Hi all,

Today's linux-next merge of the net tree got a conflict in
drivers/net/benet/be_main.c between commit 2d5d41546504 ("be2net: Fix a
potential crash during shutdown.") from the net-current tree and commit
0f4a68288217 ("be2net: cancel be_worker in be_shutdown() even when i/f is
down") from the net tree.

I fixed it up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/net/benet/be_main.c
index 88d4c80,a24fb45..0000000
--- a/drivers/net/benet/be_main.c
+++ b/drivers/net/benet/be_main.c
@@@ -3142,14 -3152,11 +3153,13 @@@ static int be_resume(struct pci_dev *pd
  static void be_shutdown(struct pci_dev *pdev)
  {
  	struct be_adapter *adapter = pci_get_drvdata(pdev);
 -	struct net_device *netdev =  adapter->netdev;
 +
 +	if (!adapter)
 +		return;
  
- 	if (netif_running(adapter->netdev))
- 		cancel_delayed_work_sync(&adapter->work);
+ 	cancel_delayed_work_sync(&adapter->work);
  
 -	netif_device_detach(netdev);
 +	netif_device_detach(adapter->netdev);
  
  	be_cmd_reset_function(adapter);
  

^ permalink raw reply	[flat|nested] 116+ messages in thread
* linux-next: manual merge of the net tree with the net-current tree
@ 2011-03-08  3:09 ` Stephen Rothwell
  0 siblings, 0 replies; 116+ messages in thread
From: Stephen Rothwell @ 2011-03-08  3:09 UTC (permalink / raw)
  To: David Miller, netdev
  Cc: linux-next, linux-kernel, Dmitry Kravkov, Eilon Greenstein,
	Vladislav Zolotarov

Hi all,

Today's linux-next merge of the net tree got a conflict in
drivers/net/bnx2x/bnx2x_cmn.c between commit
e3835b99333eb3ac7222f6fc0af5cae46074ac49 ("bnx2x: (NPAR) prevent HW
access in D3 state") from the net-current tree and commit
6e30dd4e3935ddb4e7dd27d5be7a6e5504e64a27 (bnx2x: Proper
netdev->ndo_set_rx_mode() implementation"") from the net tree.

Just overlapping additions (I think).  I have fixed it up (see below) and
can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/net/bnx2x/bnx2x_cmn.c
index a71b329,b01b622..0000000
--- a/drivers/net/bnx2x/bnx2x_cmn.c
+++ b/drivers/net/bnx2x/bnx2x_cmn.c
@@@ -1481,11 -1489,15 +1506,20 @@@ int bnx2x_nic_load(struct bnx2x *bp, in
  
  	bnx2x_set_eth_mac(bp, 1);
  
 +	if (bp->pending_max) {
 +		bnx2x_update_max_mf_config(bp, bp->pending_max);
 +		bp->pending_max = 0;
 +	}
 +
+ 	/* Clear MC configuration */
+ 	if (CHIP_IS_E1(bp))
+ 		bnx2x_invalidate_e1_mc_list(bp);
+ 	else
+ 		bnx2x_invalidate_e1h_mc_list(bp);
+ 
+ 	/* Clear UC lists configuration */
+ 	bnx2x_invalidate_uc_list(bp);
+ 
  	if (bp->port.pmf)
  		bnx2x_initial_phy_init(bp, load_mode);
  

^ permalink raw reply	[flat|nested] 116+ messages in thread
* linux-next: manual merge of the net tree with the net-current tree
@ 2011-03-03  2:40 ` Stephen Rothwell
  0 siblings, 0 replies; 116+ messages in thread
From: Stephen Rothwell @ 2011-03-03  2:40 UTC (permalink / raw)
  To: David Miller, netdev
  Cc: linux-next, linux-kernel, Dmitry Kravkov, Yaniv Rosner, Eilon Greenstein

[-- Attachment #1: Type: text/plain, Size: 517 bytes --]

Hi all,

Today's linux-next merge of the net tree got a conflict in
drivers/net/bnx2x/bnx2x.h between commit
b746f7e52fe33ce66ea0cf6127838eff507839ff ("bnx2x: update driver version
to 1.62.00-6") from the net-current tree and commit
6b28ff3be829a851378551245fd6b3f9bf93b0ad ("bnx2x: Update bnx2x version to
1.62.11-0") from the net tree.

Obvious, really :-)  I used the version from the net tree.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]

^ permalink raw reply	[flat|nested] 116+ messages in thread
* linux-next: manual merge of the net tree with the net-current tree
@ 2011-02-18  1:20 ` Stephen Rothwell
  0 siblings, 0 replies; 116+ messages in thread
From: Stephen Rothwell @ 2011-02-18  1:20 UTC (permalink / raw)
  To: David Miller, netdev
  Cc: linux-next, linux-kernel, Jesse Brandeburg, Jeff Kirsher

Hi all,

Today's linux-next merge of the net tree got a conflict in
drivers/net/e1000e/netdev.c between commit
713b3c9e4c1a6da6b45da6474ed554ed0a48de69 ("e1000e: flush all writebacks
before unload") from the net-current tree and commit
67fd4fcb78a7ced369a6bd8a131ec8c65ebd2bbb ("e1000e: convert to stats64")
from the net tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/net/e1000e/netdev.c
index 3fa110d,7cedfeb..0000000
--- a/drivers/net/e1000e/netdev.c
+++ b/drivers/net/e1000e/netdev.c
@@@ -3344,21 -3335,8 +3341,23 @@@ int e1000e_up(struct e1000_adapter *ada
  	return 0;
  }
  
 +static void e1000e_flush_descriptors(struct e1000_adapter *adapter)
 +{
 +	struct e1000_hw *hw = &adapter->hw;
 +
 +	if (!(adapter->flags2 & FLAG2_DMA_BURST))
 +		return;
 +
 +	/* flush pending descriptor writebacks to memory */
 +	ew32(TIDV, adapter->tx_int_delay | E1000_TIDV_FPD);
 +	ew32(RDTR, adapter->rx_int_delay | E1000_RDTR_FPD);
 +
 +	/* execute the writes immediately */
 +	e1e_flush();
 +}
 +
+ static void e1000e_update_stats(struct e1000_adapter *adapter);
+ 
  void e1000e_down(struct e1000_adapter *adapter)
  {
  	struct net_device *netdev = adapter->netdev;
@@@ -4179,11 -4154,7 +4186,10 @@@ static void e1000_watchdog_task(struct 
  	struct e1000_ring *tx_ring = adapter->tx_ring;
  	struct e1000_hw *hw = &adapter->hw;
  	u32 link, tctl;
- 	int tx_pending = 0;
  
 +	if (test_bit(__E1000_DOWN, &adapter->state))
 +		return;
 +
  	link = e1000e_has_link(adapter);
  	if ((netif_carrier_ok(netdev)) && link) {
  		/* Cancel scheduled suspend requests. */

^ permalink raw reply	[flat|nested] 116+ messages in thread
* linux-next: manual merge of the net tree with the net-current tree
@ 2011-02-09  0:56 ` Stephen Rothwell
  0 siblings, 0 replies; 116+ messages in thread
From: Stephen Rothwell @ 2011-02-09  0:56 UTC (permalink / raw)
  To: David Miller, netdev
  Cc: linux-next, linux-kernel, Jesse Brandeburg, Jeff Kirsher, Bruce Allan

Hi all,

Today's linux-next merge of the net tree got a conflict in
drivers/net/e1000e/netdev.c between commit
463342741222c79469303cdab8ce99c8bc2d80e8 ("e1000e: tx_timeout should not
increment for non-hang events") from the net-current tree and commit
90da06692532541a38f9857972e1fd6b1cdfb45a ("e1000e: reduce scope of some
variables, remove unnecessary ones") from the net tree.

I fixed it up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/net/e1000e/netdev.c
index 3065870,5b916b0..0000000
--- a/drivers/net/e1000e/netdev.c
+++ b/drivers/net/e1000e/netdev.c
@@@ -4299,20 -4303,18 +4303,17 @@@ link_up
  
  	e1000e_update_adaptive(&adapter->hw);
  
- 	if (!netif_carrier_ok(netdev)) {
- 		tx_pending = (e1000_desc_unused(tx_ring) + 1 <
- 			       tx_ring->count);
- 		if (tx_pending) {
- 			/*
- 			 * We've lost link, so the controller stops DMA,
- 			 * but we've got queued Tx work that's never going
- 			 * to get done, so reset controller to flush Tx.
- 			 * (Do the reset outside of interrupt context).
- 			 */
- 			schedule_work(&adapter->reset_task);
- 			/* return immediately since reset is imminent */
- 			return;
- 		}
+ 	if (!netif_carrier_ok(netdev) &&
+ 	    (e1000_desc_unused(tx_ring) + 1 < tx_ring->count)) {
+ 		/*
+ 		 * We've lost link, so the controller stops DMA,
+ 		 * but we've got queued Tx work that's never going
+ 		 * to get done, so reset controller to flush Tx.
+ 		 * (Do the reset outside of interrupt context).
+ 		 */
 -		adapter->tx_timeout_count++;
+ 		schedule_work(&adapter->reset_task);
+ 		/* return immediately since reset is imminent */
+ 		return;
  	}
  
  	/* Simple mode for Interrupt Throttle Rate (ITR) */

^ permalink raw reply	[flat|nested] 116+ messages in thread
* linux-next: manual merge of the net tree with the net-current tree
@ 2010-12-15  0:45 ` Stephen Rothwell
  0 siblings, 0 replies; 116+ messages in thread
From: Stephen Rothwell @ 2010-12-15  0:45 UTC (permalink / raw)
  To: David Miller, netdev; +Cc: linux-next, linux-kernel, Vladislav Zolotarov

[-- Attachment #1: Type: text/plain, Size: 571 bytes --]

Hi all,

Today's linux-next merge of the net tree got a conflict in
drivers/net/bnx2x/bnx2x.h between commit
9f5449611c9d6d7bdcae8020a197d8b4d9b6443c ("bnx2x: Advance a version
number to 1.60.01-0") from the net-current tree and commit
f404c2fea37e02bec7c8b6edddf5edd22ca60505 ("bnx2x: Update version number
and a date") from the net tree.

So the net tree one has a later date, but a lower version number ... I
just used the version from the net tree.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]

^ permalink raw reply	[flat|nested] 116+ messages in thread
* linux-next: manual merge of the net tree with the net-current tree
@ 2010-11-19  0:17 ` Stephen Rothwell
  0 siblings, 0 replies; 116+ messages in thread
From: Stephen Rothwell @ 2010-11-19  0:17 UTC (permalink / raw)
  To: David Miller, netdev; +Cc: linux-next, linux-kernel, Eric Dumazet

[-- Attachment #1: Type: text/plain, Size: 514 bytes --]

Hi all,

Today's linux-next merge of the net tree got a conflict in
drivers/net/bonding/bond_main.c between commit
3006bc38895895f1a0352c2e17e1a503f35f7e2f ("bonding: fix a race in IGMP
handling") from the net-current tree and commit
866f3b25a2eb60d7529c227a0ecd80c3aba443fd ("bonding: IGMP handling
cleanup") from the net tree.

I just assumed that the latter is a better solution and used that.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]

^ permalink raw reply	[flat|nested] 116+ messages in thread
* linux-next: manual merge of the net tree with the net-current tree
@ 2010-11-19  0:17 ` Stephen Rothwell
  0 siblings, 0 replies; 116+ messages in thread
From: Stephen Rothwell @ 2010-11-19  0:17 UTC (permalink / raw)
  To: David Miller, netdev; +Cc: linux-next, linux-kernel, Thomas Graf

Hi all,

Today's linux-next merge of the net tree got a conflict in
net/ipv6/addrconf.c between commit
18a31e1e282f9ed563b131526a88162ccbe04ee3 ("ipv6: Expose reachable and
retrans timer values as msecs") from the net-current tree and commit
b382b191ea9e9ccefc437433d23befe91f4a8925 ("ipv6: AF_INET6 link address
family") from the net tree.

I fixed it up (I think - see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc net/ipv6/addrconf.c
index 2fc35b3,470e7ac..0000000
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@@ -3896,6 -3894,69 +3899,68 @@@ static void snmp6_fill_stats(u64 *stats
  	}
  }
  
+ static int inet6_fill_ifla6_attrs(struct sk_buff *skb, struct inet6_dev *idev)
+ {
+ 	struct nlattr *nla;
+ 	struct ifla_cacheinfo ci;
+ 
+ 	NLA_PUT_U32(skb, IFLA_INET6_FLAGS, idev->if_flags);
+ 
+ 	ci.max_reasm_len = IPV6_MAXPLEN;
 -	ci.tstamp = (__u32)(TIME_DELTA(idev->tstamp, INITIAL_JIFFIES) / HZ * 100
 -		    + TIME_DELTA(idev->tstamp, INITIAL_JIFFIES) % HZ * 100 / HZ);
 -	ci.reachable_time = idev->nd_parms->reachable_time;
 -	ci.retrans_time = idev->nd_parms->retrans_time;
++	ci.tstamp = cstamp_delta(idev->tstamp);
++	ci.reachable_time = jiffies_to_msecs(idev->nd_parms->reachable_time);
++	ci.retrans_time = jiffies_to_msecs(idev->nd_parms->retrans_time);
+ 	NLA_PUT(skb, IFLA_INET6_CACHEINFO, sizeof(ci), &ci);
+ 
+ 	nla = nla_reserve(skb, IFLA_INET6_CONF, DEVCONF_MAX * sizeof(s32));
+ 	if (nla == NULL)
+ 		goto nla_put_failure;
+ 	ipv6_store_devconf(&idev->cnf, nla_data(nla), nla_len(nla));
+ 
+ 	/* XXX - MC not implemented */
+ 
+ 	nla = nla_reserve(skb, IFLA_INET6_STATS, IPSTATS_MIB_MAX * sizeof(u64));
+ 	if (nla == NULL)
+ 		goto nla_put_failure;
+ 	snmp6_fill_stats(nla_data(nla), idev, IFLA_INET6_STATS, nla_len(nla));
+ 
+ 	nla = nla_reserve(skb, IFLA_INET6_ICMP6STATS, ICMP6_MIB_MAX * sizeof(u64));
+ 	if (nla == NULL)
+ 		goto nla_put_failure;
+ 	snmp6_fill_stats(nla_data(nla), idev, IFLA_INET6_ICMP6STATS, nla_len(nla));
+ 
+ 	return 0;
+ 
+ nla_put_failure:
+ 	return -EMSGSIZE;
+ }
+ 
+ static size_t inet6_get_link_af_size(const struct net_device *dev)
+ {
+ 	if (!__in6_dev_get(dev))
+ 		return 0;
+ 
+ 	return inet6_ifla6_size();
+ }
+ 
+ static int inet6_fill_link_af(struct sk_buff *skb, const struct net_device *dev)
+ {
+ 	struct inet6_dev *idev = __in6_dev_get(dev);
+ 
+ 	if (!idev)
+ 		return -ENODATA;
+ 
+ 	if (inet6_fill_ifla6_attrs(skb, idev) < 0)
+ 		return -EMSGSIZE;
+ 
+ 	return 0;
+ }
+ 
+ static int inet6_parse_link_af(struct net_device *dev, const struct nlattr *nla)
+ {
+ 	return -EOPNOTSUPP;
+ }
+ 
  static int inet6_fill_ifinfo(struct sk_buff *skb, struct inet6_dev *idev,
  			     u32 pid, u32 seq, int event, unsigned int flags)
  {

^ permalink raw reply	[flat|nested] 116+ messages in thread
* linux-next: manual merge of the net tree with the net-current tree
@ 2010-10-07  1:31 ` Stephen Rothwell
  0 siblings, 0 replies; 116+ messages in thread
From: Stephen Rothwell @ 2010-10-07  1:31 UTC (permalink / raw)
  To: David Miller, netdev
  Cc: linux-next, linux-kernel, Eric Dumazet, David Miller, netdev,
	Joe Perches

Hi all,

Today's linux-next merge of the net tree got a conflict in
net/caif/caif_socket.c between commit
79315068f4560f3f7bd6e9790190dcb43059770c ("caif: fix two caif_connect()
bugs") from the net-current tree and commit
b31fa5bad576cd8180a5ad70c648333b44320d44 ("net/caif: Use pr_fmt") from
the net tree.

I fixed it up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc net/caif/caif_socket.c
index 4bf28f2,abcba53..0000000
--- a/net/caif/caif_socket.c
+++ b/net/caif/caif_socket.c
@@@ -897,23 -888,14 +889,22 @@@ static int caif_connect(struct socket *
  		cf_sk->sk.sk_state = CAIF_DISCONNECTED;
  		goto out;
  	}
 -	dev = dev_get_by_index(sock_net(sk), ifindex);
 +
 +	err = -ENODEV;
 +	rcu_read_lock();
 +	dev = dev_get_by_index_rcu(sock_net(sk), ifindex);
 +	if (!dev) {
 +		rcu_read_unlock();
 +		goto out;
 +	}
  	cf_sk->headroom = LL_RESERVED_SPACE_EXTRA(dev, headroom);
 +	mtu = dev->mtu;
 +	rcu_read_unlock();
 +
  	cf_sk->tailroom = tailroom;
 -	cf_sk->maxframe = dev->mtu - (headroom + tailroom);
 -	dev_put(dev);
 +	cf_sk->maxframe = mtu - (headroom + tailroom);
  	if (cf_sk->maxframe < 1) {
- 		pr_warning("CAIF: %s(): CAIF Interface MTU too small (%u)\n",
- 			   __func__, mtu);
 -		pr_warn("CAIF Interface MTU too small (%d)\n", dev->mtu);
 -		err = -ENODEV;
++		pr_warn("CAIF Interface MTU too small (%d)\n", mtu);
  		goto out;
  	}
  

^ permalink raw reply	[flat|nested] 116+ messages in thread
* linux-next: manual merge of the net tree with the net-current tree
@ 2010-10-01  2:48 ` Stephen Rothwell
  0 siblings, 0 replies; 116+ messages in thread
From: Stephen Rothwell @ 2010-10-01  2:48 UTC (permalink / raw)
  To: David Miller, netdev
  Cc: linux-next, linux-kernel, Dmitry Kozlov, Eric Dumazet

Hi all,

Today's linux-next merge of the net tree got a conflict in
net/ipv4/Kconfig between commit 68c1f3a96c32a4fe15ebadae45c8145a5e5a66d2
("ip_gre: Fix dependencies wrt. ipv6") from the net-current tree and
commit 00959ade36acadc00e757f87060bf6e4501d545f ("PPTP: PPP over IPv4
(Point-to-Point Tunneling Protocol)") from the net tree.

Just overlapping additions.  I fixed it up (see below) and can carry the
fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc net/ipv4/Kconfig
index 72380a3,5462e2d..0000000
--- a/net/ipv4/Kconfig
+++ b/net/ipv4/Kconfig
@@@ -215,9 -215,15 +215,16 @@@ config NET_IPI
  	  be inserted in and removed from the running kernel whenever you
  	  want). Most people won't need this and can say N.
  
+ config NET_IPGRE_DEMUX
+ 	tristate "IP: GRE demultiplexer"
+ 	help
+ 	 This is helper module to demultiplex GRE packets on GRE version field criteria.
+ 	 Required by ip_gre and pptp modules.
+ 
  config NET_IPGRE
  	tristate "IP: GRE tunnels over IP"
 +	depends on IPV6 || IPV6=n
+ 	depends on NET_IPGRE_DEMUX
  	help
  	  Tunneling means encapsulating data of one protocol type within
  	  another protocol and sending it over a channel that understands the

^ permalink raw reply	[flat|nested] 116+ messages in thread
* linux-next: manual merge of the net tree with the net-current tree
@ 2010-10-01  2:48 ` Stephen Rothwell
  0 siblings, 0 replies; 116+ messages in thread
From: Stephen Rothwell @ 2010-10-01  2:48 UTC (permalink / raw)
  To: David Miller, netdev; +Cc: linux-next, linux-kernel, Damian Lukowski, Jerry Chu

Hi all,

Today's linux-next merge of the net tree got a conflict in
net/ipv4/tcp_timer.c between commit
4d22f7d372f5769c6c0149e427ed6353e2dcfe61 ("net-2.6: SYN retransmits: Add
new parameter to retransmits_timed_out()") from the net-current tree and
commit dca43c75e7e545694a9dd6288553f55c53e2a3a3 ("tcp: Add
TCP_USER_TIMEOUT socket option") from the net tree.

I fixed it up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc net/ipv4/tcp_timer.c
index 74c54b3,baea4a1..0000000
--- a/net/ipv4/tcp_timer.c
+++ b/net/ipv4/tcp_timer.c
@@@ -140,11 -139,9 +140,11 @@@ static void tcp_mtu_probing(struct inet
   */
  static bool retransmits_timed_out(struct sock *sk,
  				  unsigned int boundary,
 -				  unsigned int timeout)
++				  unsigned int timeout,
 +				  bool syn_set)
  {
- 	unsigned int timeout, linear_backoff_thresh;
- 	unsigned int start_ts;
+ 	unsigned int linear_backoff_thresh, start_ts;
 +	unsigned int rto_base = syn_set ? TCP_TIMEOUT_INIT : TCP_RTO_MIN;
  
  	if (!inet_csk(sk)->icsk_retransmits)
  		return false;
@@@ -154,14 -151,15 +154,16 @@@
  	else
  		start_ts = tcp_sk(sk)->retrans_stamp;
  
- 	linear_backoff_thresh = ilog2(TCP_RTO_MAX/rto_base);
+ 	if (likely(timeout == 0)) {
 -		linear_backoff_thresh = ilog2(TCP_RTO_MAX/TCP_RTO_MIN);
++		linear_backoff_thresh = ilog2(TCP_RTO_MAX/rto_base);
  
- 	if (boundary <= linear_backoff_thresh)
- 		timeout = ((2 << boundary) - 1) * rto_base;
- 	else
- 		timeout = ((2 << linear_backoff_thresh) - 1) * rto_base +
- 			  (boundary - linear_backoff_thresh) * TCP_RTO_MAX;
+ 		if (boundary <= linear_backoff_thresh)
 -			timeout = ((2 << boundary) - 1) * TCP_RTO_MIN;
++			timeout = ((2 << boundary) - 1) * rto_base;
+ 		else
 -			timeout = ((2 << linear_backoff_thresh) - 1) * TCP_RTO_MIN +
++			timeout = ((2 << linear_backoff_thresh) - 1) * rto_base +
+ 				(boundary - linear_backoff_thresh) * TCP_RTO_MAX;
 +
+ 	}
  	return (tcp_time_stamp - start_ts) >= timeout;
  }
  
@@@ -176,9 -174,8 +178,9 @@@ static int tcp_write_timeout(struct soc
  		if (icsk->icsk_retransmits)
  			dst_negative_advice(sk);
  		retry_until = icsk->icsk_syn_retries ? : sysctl_tcp_syn_retries;
 +		syn_set = 1;
  	} else {
--		if (retransmits_timed_out(sk, sysctl_tcp_retries1, 0)) {
++		if (retransmits_timed_out(sk, sysctl_tcp_retries1, 0, 0)) {
  			/* Black hole detection */
  			tcp_mtu_probing(icsk, sk);
  
@@@ -191,14 -188,16 +193,16 @@@
  
  			retry_until = tcp_orphan_retries(sk, alive);
  			do_reset = alive ||
--				   !retransmits_timed_out(sk, retry_until, 0);
++				   !retransmits_timed_out(sk, retry_until, 0, 0);
  
  			if (tcp_out_of_resources(sk, do_reset))
  				return 1;
  		}
  	}
  
- 	if (retransmits_timed_out(sk, retry_until, syn_set)) {
+ 	if (retransmits_timed_out(sk, retry_until,
+ 	    (1 << sk->sk_state) & (TCPF_SYN_SENT | TCPF_SYN_RECV) ? 0 :
 -	    icsk->icsk_user_timeout)) {
++	    icsk->icsk_user_timeout, syn_set)) {
  		/* Has it gone just too far? */
  		tcp_write_err(sk);
  		return 1;
@@@ -440,7 -439,7 +444,7 @@@ out_reset_timer
  		icsk->icsk_rto = min(icsk->icsk_rto << 1, TCP_RTO_MAX);
  	}
  	inet_csk_reset_xmit_timer(sk, ICSK_TIME_RETRANS, icsk->icsk_rto, TCP_RTO_MAX);
--	if (retransmits_timed_out(sk, sysctl_tcp_retries1 + 1, 0))
++	if (retransmits_timed_out(sk, sysctl_tcp_retries1 + 1, 0, 0))
  		__sk_dst_reset(sk);
  
  out:;

^ permalink raw reply	[flat|nested] 116+ messages in thread
* linux-next: manual merge of the net tree with the net-current tree
@ 2010-09-23  2:14 ` Stephen Rothwell
  0 siblings, 0 replies; 116+ messages in thread
From: Stephen Rothwell @ 2010-09-23  2:14 UTC (permalink / raw)
  To: David Miller, netdev; +Cc: linux-next, linux-kernel, Eric Dumazet

Hi all,

Today's linux-next merge of the net tree got a conflict in
net/ipv4/ip_output.c between commit
3d13008e7345fa7a79d8f6438150dc15d6ba6e9d ("ip: fix truesize mismatch in
ip fragmentation") from the net-current tree and commit
21dc330157454046dd7c494961277d76e1c957fe ("net: Rename skb_has_frags to
skb_has_frag_list") from the net tree.

Just context changes.  I fixed it up (see below) and can carry the fix
for a while.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc net/ipv4/ip_output.c
index 7649d77,e427620..0000000
--- a/net/ipv4/ip_output.c
+++ b/net/ipv4/ip_output.c
@@@ -487,9 -487,10 +487,9 @@@ int ip_fragment(struct sk_buff *skb, in
  	 * LATER: this step can be merged to real generation of fragments,
  	 * we can switch to copy when see the first bad fragment.
  	 */
- 	if (skb_has_frags(skb)) {
+ 	if (skb_has_frag_list(skb)) {
 -		struct sk_buff *frag;
 +		struct sk_buff *frag, *frag2;
  		int first_len = skb_pagelen(skb);
 -		int truesizes = 0;
  
  		if (first_len - hlen > mtu ||
  		    ((first_len - hlen) & 7) ||

^ permalink raw reply	[flat|nested] 116+ messages in thread
* linux-next: manual merge of the net tree with the net-current tree
@ 2010-08-02  1:04 ` Stephen Rothwell
  0 siblings, 0 replies; 116+ messages in thread
From: Stephen Rothwell @ 2010-08-02  1:04 UTC (permalink / raw)
  To: David Miller, netdev; +Cc: linux-next, linux-kernel, Herbert Xu

Hi all,

Today's linux-next merge of the net tree got a conflict in
net/bridge/br_device.c between commit
6d1d1d398cb7db7a12c5d652d50f85355345234f ("bridge: Fix skb leak when
multicast parsing fails on TX") from the net-current tree and commit
91d2c34a4eed32876ca333b0ca44f3bc56645805 ("bridge: Fix netpoll support")
from the net tree.

Just context changes. I fixed it up (see below) and can carry the fix for
a while.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc net/bridge/br_device.c
index f49bcd9,075c435..0000000
--- a/net/bridge/br_device.c
+++ b/net/bridge/br_device.c
@@@ -46,12 -48,13 +48,16 @@@ netdev_tx_t br_dev_xmit(struct sk_buff 
  	skb_reset_mac_header(skb);
  	skb_pull(skb, ETH_HLEN);
  
 +	rcu_read_lock();
  	if (is_multicast_ether_addr(dest)) {
+ 		if (unlikely(netpoll_tx_running(dev))) {
+ 			br_flood_deliver(br, skb);
+ 			goto out;
+ 		}
 -		if (br_multicast_rcv(br, NULL, skb))
 +		if (br_multicast_rcv(br, NULL, skb)) {
 +			kfree_skb(skb);
  			goto out;
 +		}
  
  		mdst = br_mdb_get(br, skb);
  		if (mdst || BR_INPUT_SKB_CB_MROUTERS_ONLY(skb))

^ permalink raw reply	[flat|nested] 116+ messages in thread
* linux-next: manual merge of the net tree with the net-current tree
@ 2010-07-29  1:19 ` Stephen Rothwell
  0 siblings, 0 replies; 116+ messages in thread
From: Stephen Rothwell @ 2010-07-29  1:19 UTC (permalink / raw)
  To: David Miller, netdev; +Cc: linux-next, linux-kernel, Bruce Allan, Jeff Kirsher

Hi all,

Today's linux-next merge of the net tree got a conflict in
drivers/net/e1000e/hw.h between commit
ff847ac2d3e90edd94674c28bade25ae1e6a2e49 ("") from the net-current tree
and commit d3738bb8203acf8552c3ec8b3447133fc0938ddd ("e1000e: initial
support for 82579 LOMs") from the net tree.

Just context changes. I fixed it up (see below) and can carry the fix for
a while.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/net/e1000e/hw.h
index 664ed58,0cd569a..0000000
--- a/drivers/net/e1000e/hw.h
+++ b/drivers/net/e1000e/hw.h
@@@ -308,8 -312,8 +312,8 @@@ enum e1e_registers 
  #define E1000_KMRNCTRLSTA_INBAND_PARAM	0x9    /* Kumeran InBand Parameters */
  #define E1000_KMRNCTRLSTA_DIAG_NELPBK	0x1000 /* Nearend Loopback mode */
  #define E1000_KMRNCTRLSTA_K1_CONFIG	0x7
 -#define E1000_KMRNCTRLSTA_K1_ENABLE	0x140E
 +#define E1000_KMRNCTRLSTA_K1_ENABLE	0x0002
- #define E1000_KMRNCTRLSTA_K1_DISABLE	0x1400
+ #define E1000_KMRNCTRLSTA_HD_CTRL	0x0002
  
  #define IFE_PHY_EXTENDED_STATUS_CONTROL	0x10
  #define IFE_PHY_SPECIAL_CONTROL		0x11 /* 100BaseTx PHY Special Control */

^ permalink raw reply	[flat|nested] 116+ messages in thread
* linux-next: manual merge of the net tree with the net-current tree
@ 2010-07-29  1:05 ` Stephen Rothwell
  0 siblings, 0 replies; 116+ messages in thread
From: Stephen Rothwell @ 2010-07-29  1:05 UTC (permalink / raw)
  To: David Miller, netdev
  Cc: linux-next, linux-kernel, stephen hemminger, Jiri Pirko

Hi all,

Today's linux-next merge of the net tree got a conflict in
net/bridge/br_input.c between commit
eeaf61d8891f9c9ed12c1a667e72bf83f0857954 ("bridge: add rcu_read_lock on
transmit") from the net-current tree and commit
ab95bfe01f9872459c8678572ccadbf646badad0 ("net: replace hooks in
__netif_receive_skb V5") from the net tree.

Just overlapping changes in a comment.  I fixed it up (see below) and can
carry the fix for a while.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc net/bridge/br_input.c
index 114365c,5fc1c5b..0000000
--- a/net/bridge/br_input.c
+++ b/net/bridge/br_input.c
@@@ -108,13 -110,12 +110,12 @@@ drop
  	goto out;
  }
  
 -/* note: already called with rcu_read_lock (preempt_disabled) */
 +/* note: already called with rcu_read_lock */
  static int br_handle_local_finish(struct sk_buff *skb)
  {
- 	struct net_bridge_port *p = rcu_dereference(skb->dev->br_port);
+ 	struct net_bridge_port *p = br_port_get_rcu(skb->dev);
  
- 	if (p)
- 		br_fdb_update(p->br, p, eth_hdr(skb)->h_source);
+ 	br_fdb_update(p->br, p, eth_hdr(skb)->h_source);
  	return 0;	 /* process further */
  }
  
@@@ -131,12 -132,13 +132,12 @@@ static inline int is_link_local(const u
  }
  
  /*
-  * Called via br_handle_frame_hook.
   * Return NULL if skb is handled
-  * note: already called with rcu_read_lock
 - * note: already called with rcu_read_lock (preempt_disabled) from
 - * netif_receive_skb
++ * note: already called with rcu_read_lock from netif_receive_skb
   */
- struct sk_buff *br_handle_frame(struct net_bridge_port *p, struct sk_buff *skb)
+ struct sk_buff *br_handle_frame(struct sk_buff *skb)
  {
+ 	struct net_bridge_port *p;
  	const unsigned char *dest = eth_hdr(skb)->h_dest;
  	int (*rhook)(struct sk_buff *skb);
  

^ permalink raw reply	[flat|nested] 116+ messages in thread
* linux-next: manual merge of the net tree with the net-current tree
@ 2010-07-20  2:20 ` Stephen Rothwell
  0 siblings, 0 replies; 116+ messages in thread
From: Stephen Rothwell @ 2010-07-20  2:20 UTC (permalink / raw)
  To: David Miller, netdev
  Cc: linux-next, linux-kernel, Jeff Dike, Michael S. Tsirkin

Hi all,

Today's linux-next merge of the net tree got a conflict in
drivers/vhost/net.c between commit
1680e9063ea28099a1efa8ca11cee069cc7a9bc3 ("vhost-net: avoid flush under
lock") from the net-current tree and commit
dd1f4078f0d2de74a308f00a2dffbd550cfba59f ("vhost-net: minor cleanup")
from the net tree.

I fixed it up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/vhost/net.c
index d219070,107af9e..0000000
--- a/drivers/vhost/net.c
+++ b/drivers/vhost/net.c
@@@ -527,15 -527,12 +527,14 @@@ static long vhost_net_set_backend(struc
  
  	/* start polling new socket */
  	oldsock = vq->private_data;
- 	if (sock == oldsock)
- 		goto done;
+ 	if (sock != oldsock){
+                 vhost_net_disable_vq(n, vq);
+                 rcu_assign_pointer(vq->private_data, sock);
+                 vhost_net_enable_vq(n, vq);
+ 	}
  
- 	vhost_net_disable_vq(n, vq);
- 	rcu_assign_pointer(vq->private_data, sock);
- 	vhost_net_enable_vq(n, vq);
- done:
 +	mutex_unlock(&vq->mutex);
 +
  	if (oldsock) {
  		vhost_net_flush_vq(n, index);
  		fput(oldsock->file);

^ permalink raw reply	[flat|nested] 116+ messages in thread
* linux-next: manual merge of the net tree with the net-current tree
@ 2010-06-23  2:51 ` Stephen Rothwell
  0 siblings, 0 replies; 116+ messages in thread
From: Stephen Rothwell @ 2010-06-23  2:51 UTC (permalink / raw)
  To: David Miller, netdev
  Cc: linux-next, linux-kernel, Herbert Xu, Changli Gao, Eric Dumazet

Hi all,

Today's linux-next merge of the net tree got a conflict in
net/ipv4/ip_output.c between commit
26cde9f7e2747b6d254b704594eed87ab959afa5 ("udp: Fix bogus UFO packet
generation") from the net-current tree and commit
d8d1f30b95a635dbd610dcc5eb641aca8f4768cf ("net-next: remove useless union
keyword") from the net tree.

Just context changes. I fixed it up (see below) and can carry the fix as
necessary.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc net/ipv4/ip_output.c
index 041d41d,6cbeb2e..0000000
--- a/net/ipv4/ip_output.c
+++ b/net/ipv4/ip_output.c
@@@ -873,12 -873,10 +873,12 @@@ int ip_append_data(struct sock *sk
  	    !exthdrlen)
  		csummode = CHECKSUM_PARTIAL;
  
 +	skb = skb_peek_tail(&sk->sk_write_queue);
 +
  	inet->cork.length += length;
 -	if (((length> mtu) || !skb_queue_empty(&sk->sk_write_queue)) &&
 +	if (((length > mtu) || (skb && skb_is_gso(skb))) &&
  	    (sk->sk_protocol == IPPROTO_UDP) &&
- 	    (rt->u.dst.dev->features & NETIF_F_UFO)) {
+ 	    (rt->dst.dev->features & NETIF_F_UFO)) {
  		err = ip_ufo_append_data(sk, getfrag, from, length, hh_len,
  					 fragheaderlen, transhdrlen, mtu,
  					 flags);
@@@ -1123,9 -1121,8 +1123,9 @@@ ssize_t	ip_append_page(struct sock *sk
  		return -EINVAL;
  
  	inet->cork.length += size;
 -	if ((sk->sk_protocol == IPPROTO_UDP) &&
 +	if ((size + skb->len > mtu) &&
 +	    (sk->sk_protocol == IPPROTO_UDP) &&
- 	    (rt->u.dst.dev->features & NETIF_F_UFO)) {
+ 	    (rt->dst.dev->features & NETIF_F_UFO)) {
  		skb_shinfo(skb)->gso_size = mtu - fragheaderlen;
  		skb_shinfo(skb)->gso_type = SKB_GSO_UDP;
  	}

^ permalink raw reply	[flat|nested] 116+ messages in thread
* linux-next: manual merge of the net tree with the net-current tree
@ 2010-06-15  2:00 ` Stephen Rothwell
  0 siblings, 0 replies; 116+ messages in thread
From: Stephen Rothwell @ 2010-06-15  2:00 UTC (permalink / raw)
  To: David Miller, netdev
  Cc: linux-next, linux-kernel, Emil Tantilov, Jeff Kirsher, Andy Gospodarek

Hi all,

Today's linux-next merge of the net tree got a conflict in
drivers/net/ixgbe/ixgbe_ethtool.c between commit
28c8e4790ca5ef75f54895ca46437f9fbb433ddf ("ixgbe: fix automatic LRO/RSC
settings for low latency") from the net-current tree and commit
849c45423c0c108e08d67644728cc9b0ed225fa1 ("ixgbe: Use netdev_<level>,
dev_<level>, pr_<level>") from the net tree.

I fixed it up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/net/ixgbe/ixgbe_ethtool.c
index 3a93a81,644e3d2..0000000
--- a/drivers/net/ixgbe/ixgbe_ethtool.c
+++ b/drivers/net/ixgbe/ixgbe_ethtool.c
@@@ -2132,11 -2155,9 +2130,10 @@@ static int ixgbe_set_coalesce(struct ne
  		 */
  		if (adapter->flags2 & IXGBE_FLAG2_RSC_ENABLED) {
  			adapter->flags2 &= ~IXGBE_FLAG2_RSC_ENABLED;
 -			netdev->features &= ~NETIF_F_LRO;
 -			e_info("rx-usecs set to 0, disabling RSC\n");
 -
 +			if (netdev->features & NETIF_F_LRO) {
 +				netdev->features &= ~NETIF_F_LRO;
- 				DPRINTK(PROBE, INFO, "rx-usecs set to 0, "
- 					"disabling LRO/RSC\n");
++				e_info("rx-usecs set to 0, disabling LRO/RSC\n");
 +			}
  			need_reset = true;
  		}
  	}

^ permalink raw reply	[flat|nested] 116+ messages in thread
* linux-next: manual merge of the net tree with the net-current tree
@ 2009-11-24  3:11 ` Stephen Rothwell
  0 siblings, 0 replies; 116+ messages in thread
From: Stephen Rothwell @ 2009-11-24  3:11 UTC (permalink / raw)
  To: David Miller, netdev; +Cc: linux-next, linux-kernel, Bruce Allan, Jeff Kirsher

Hi all,

Today's linux-next merge of the net tree got a conflict in
drivers/net/e1000e/phy.c between commit
189983d469c6d98e64ddfb9f9ce76725cb082ee5 ("e1000e: remove unnecessary
82577 workaround causing link issues") from the net-current tree and
commit 94d8186a693284344ee5cb9734086c7a2370241a ("e1000e: cleanup ops
function pointers") from the net tree.

I fixed it up (see below) and can carry the fix for a while.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

diff --cc drivers/net/e1000e/phy.c
index 85f955f,99d53fa..0000000
--- a/drivers/net/e1000e/phy.c
+++ b/drivers/net/e1000e/phy.c
@@@ -658,7 -659,16 +658,7 @@@ s32 e1000_copper_link_setup_82577(struc
  	/* Enable downshift */
  	phy_data |= I82577_CFG_ENABLE_DOWNSHIFT;
  
- 	ret_val = phy->ops.write_phy_reg(hw, I82577_CFG_REG, phy_data);
+ 	ret_val = phy->ops.write_reg(hw, I82577_CFG_REG, phy_data);
 -	if (ret_val)
 -		goto out;
 -
 -	/* Set number of link attempts before downshift */
 -	ret_val = phy->ops.read_reg(hw, I82577_CTRL_REG, &phy_data);
 -	if (ret_val)
 -		goto out;
 -	phy_data &= ~I82577_CTRL_DOWNSHIFT_MASK;
 -	ret_val = phy->ops.write_reg(hw, I82577_CTRL_REG, phy_data);
  
  out:
  	return ret_val;
@@@ -2667,10 -2678,10 +2667,10 @@@ static s32 __e1000_read_phy_reg_hv(stru
  out:
  	/* Revert to MDIO fast mode, if applicable */
  	if ((hw->phy.type == e1000_phy_82577) && in_slow_mode)
 -		ret_val = e1000_set_mdio_slow_mode_hv(hw, false);
 +		ret_val |= e1000_set_mdio_slow_mode_hv(hw, false);
  
  	if (!locked)
- 		hw->phy.ops.release_phy(hw);
+ 		hw->phy.ops.release(hw);
  
  	return ret_val;
  }
@@@ -2793,10 -2805,10 +2793,10 @@@ static s32 __e1000_write_phy_reg_hv(str
  out:
  	/* Revert to MDIO fast mode, if applicable */
  	if ((hw->phy.type == e1000_phy_82577) && in_slow_mode)
 -		ret_val = e1000_set_mdio_slow_mode_hv(hw, false);
 +		ret_val |= e1000_set_mdio_slow_mode_hv(hw, false);
  
  	if (!locked)
- 		hw->phy.ops.release_phy(hw);
+ 		hw->phy.ops.release(hw);
  
  	return ret_val;
  }

^ permalink raw reply	[flat|nested] 116+ messages in thread
* linux-next: manual merge of the net tree with the net-current tree
@ 2009-11-24  3:11 ` Stephen Rothwell
  0 siblings, 0 replies; 116+ messages in thread
From: Stephen Rothwell @ 2009-11-24  3:11 UTC (permalink / raw)
  To: David Miller, netdev; +Cc: linux-next, linux-kernel, Bruce Allan, Jeff Kirsher

Hi all,

Today's linux-next merge of the net tree got a conflict in
drivers/net/e1000e/ich8lan.c between commit
818f33313caab9be2a10458500dbed4a88c1b334 ("e1000e: do not initiate
autonegotiation during OEM configuration") from the net-current tree and
commit 94d8186a693284344ee5cb9734086c7a2370241a ("e1000e: cleanup ops
function pointers") from the net tree.

Just context changes. I fixed it up (see below) and can carry the fix for
a while.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/net/e1000e/ich8lan.c
index eff3f47,568bb25..0000000
--- a/drivers/net/e1000e/ich8lan.c
+++ b/drivers/net/e1000e/ich8lan.c
@@@ -1118,12 -1110,11 +1110,12 @@@ static s32 e1000_oem_bits_config_ich8la
  			oem_reg |= HV_OEM_BITS_LPLU;
  	}
  	/* Restart auto-neg to activate the bits */
 -	oem_reg |= HV_OEM_BITS_RESTART_AN;
 +	if (!e1000_check_reset_block(hw))
 +		oem_reg |= HV_OEM_BITS_RESTART_AN;
- 	ret_val = hw->phy.ops.write_phy_reg_locked(hw, HV_OEM_BITS, oem_reg);
+ 	ret_val = hw->phy.ops.write_reg_locked(hw, HV_OEM_BITS, oem_reg);
  
  out:
- 	hw->phy.ops.release_phy(hw);
+ 	hw->phy.ops.release(hw);
  
  	return ret_val;
  }

^ permalink raw reply	[flat|nested] 116+ messages in thread
* linux-next: manual merge of the net tree with the net-current tree
@ 2009-11-23  1:00 ` Stephen Rothwell
  0 siblings, 0 replies; 116+ messages in thread
From: Stephen Rothwell @ 2009-11-23  1:00 UTC (permalink / raw)
  To: David Miller, netdev; +Cc: linux-next, linux-kernel, Eric Dumazet

[-- Attachment #1: Type: text/plain, Size: 541 bytes --]

Hi all,

Today's linux-next merge of the net tree got a conflict in
drivers/ieee802154/fakehard.c between commit
56cf54831fd1be105e89a9df899e3b22442da180 ("ieee802154: dont leak skbs in
ieee802154_fake_xmit()") from the net-current tree and commit
8964be4a9a5ca8cab1219bb046db2f6d1936227c ("net: rename skb->iif to
skb->skb_iif") from the net tree.

The former removed the code modified by the latter, so I used the former.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]

^ permalink raw reply	[flat|nested] 116+ messages in thread
* linux-next: manual merge of the net tree with the net-current tree
@ 2009-11-17  2:16 ` Stephen Rothwell
  0 siblings, 0 replies; 116+ messages in thread
From: Stephen Rothwell @ 2009-11-17  2:16 UTC (permalink / raw)
  To: David Miller, netdev
  Cc: linux-next, linux-kernel, Wolfram Sang, Christian Pellegrin,
	Wolfgang Grandegger, Anant Gole, Oliver Hartkopp

Hi all,

Today's linux-next merge of the net tree got a conflict in
drivers/net/can/Kconfig between commit
b93cf3f0bb45560d2ce62bdcc2181c40660cfdbf ("can: Fix driver Kconfig
structure") from the net-current tree and commits
3758bf25db8caeec667e4e56e030da0ec3060529 ("can: add TI CAN (HECC)
driver"), e0000163e30eeb112b41486ea113fd54f64e1f17 ("can: Driver for the
Microchip MCP251x SPI CAN controllers") and
afa17a500a3667f66df450100538d06769529bba ("net/can: add driver for mscan
family & mpc52xx_mscan") from the net tree.

I fixed it up (see below) and can carry the fix for a while. (I am not
sure the fix is entirely correct.)

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/net/can/Kconfig
index 772f6d2,c16e6ff..0000000
--- a/drivers/net/can/Kconfig
+++ b/drivers/net/can/Kconfig
@@@ -41,10 -95,38 +41,42 @@@ config CAN_AT9
  	---help---
  	  This is a driver for the SoC CAN controller in Atmel's AT91SAM9263.
  
+ config CAN_TI_HECC
+ 	depends on CAN_DEV && ARCH_OMAP3
+ 	tristate "TI High End CAN Controller"
+ 	---help---
+ 	  Driver for TI HECC (High End CAN Controller) module found on many
+ 	  TI devices. The device specifications are available from www.ti.com
+ 
+ config CAN_MCP251X
+ 	tristate "Microchip MCP251x SPI CAN controllers"
+ 	depends on CAN_DEV && SPI
+ 	---help---
+ 	  Driver for the Microchip MCP251x SPI CAN controllers.
+ 
+ config CAN_MSCAN
+ 	depends on CAN_DEV && (PPC || M68K || M68KNOMMU)
+ 	tristate "Support for Freescale MSCAN based chips"
+ 	---help---
+ 	  The Motorola Scalable Controller Area Network (MSCAN) definition
+ 	  is based on the MSCAN12 definition which is the specific
+ 	  implementation of the Motorola Scalable CAN concept targeted for
+ 	  the Motorola MC68HC12 Microcontroller Family.
+ 
+ config CAN_MPC52XX
+ 	tristate "Freescale MPC5xxx onboard CAN controller"
+ 	depends on CAN_MSCAN && PPC_MPC52xx
+ 	---help---
+ 	  If you say yes here you get support for Freescale's MPC52xx
+ 	  onboard dualCAN controller.
+ 
+ 	  This driver can also be built as a module.  If so, the module
+ 	  will be called mpc5xxx_can.
+ 
 +source "drivers/net/can/sja1000/Kconfig"
 +
 +source "drivers/net/can/usb/Kconfig"
 +
  config CAN_DEBUG_DEVICES
  	bool "CAN devices debugging messages"
  	depends on CAN

^ permalink raw reply	[flat|nested] 116+ messages in thread
* linux-next: manual merge of the net tree with the net-current tree
@ 2009-11-09  2:03 ` Stephen Rothwell
  0 siblings, 0 replies; 116+ messages in thread
From: Stephen Rothwell @ 2009-11-09  2:03 UTC (permalink / raw)
  To: David Miller, netdev
  Cc: linux-next, linux-kernel, Wolfgang Grandegger, Sebastian Haas

Hi all,

Today's linux-next merge of the net tree got a conflict in
drivers/net/can/usb/ems_usb.c between commit
2b2072e902848a63168570f500a5726744b3873a ("ems_usb: Fix byte order issues
on big endian machines") from the net-current tree and commit
7b6856a0296a8f187bb88ba31fa83a08abba7966 ("can: provide library functions
for skb allocation") from the net tree.

Just context changes.  I fixed it up (see below) and can carry the fix
for a while.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/net/can/usb/ems_usb.c
index abdbd9c,3685f3e..0000000
--- a/drivers/net/can/usb/ems_usb.c
+++ b/drivers/net/can/usb/ems_usb.c
@@@ -315,11 -315,7 +315,7 @@@ static void ems_usb_rx_can_msg(struct e
  	if (skb == NULL)
  		return;
  
- 	skb->protocol = htons(ETH_P_CAN);
- 
- 	cf = (struct can_frame *)skb_put(skb, sizeof(struct can_frame));
- 
 -	cf->can_id = msg->msg.can_msg.id;
 +	cf->can_id = le32_to_cpu(msg->msg.can_msg.id);
  	cf->can_dlc = min_t(u8, msg->msg.can_msg.length, 8);
  
  	if (msg->type == CPC_MSG_TYPE_EXT_CAN_FRAME

^ permalink raw reply	[flat|nested] 116+ messages in thread
* linux-next: manual merge of the net tree with the net-current tree
@ 2009-11-06  0:55 ` Stephen Rothwell
  0 siblings, 0 replies; 116+ messages in thread
From: Stephen Rothwell @ 2009-11-06  0:55 UTC (permalink / raw)
  To: David Miller, netdev
  Cc: linux-next, linux-kernel, Marcel Holtmann, Torgny Johansson

Hi all,

Today's linux-next merge of the net tree got a conflict in
drivers/net/usb/cdc_ether.c between commit
3a19d56c71bd3a08412d609d219ac8eec0819166 ("cdc_ether: additional Ericsson
MBM PID's to the whitelist") from the net-current tree and commit
e1e499eef2200c2a7120c9ebf297d48b195cf887 ("usbnet: Use wwan%d interface
name for mobile broadband devices") from the net tree.

Context changes.  I fixed it up (see below) and can carry it as
necessary.  This fix may not be completely correct ...

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/net/usb/cdc_ether.c
index 21e1ba1,71e65fc..0000000
--- a/drivers/net/usb/cdc_ether.c
+++ b/drivers/net/usb/cdc_ether.c
@@@ -542,62 -550,22 +550,62 @@@ static const struct usb_device_id	produ
  	/* Ericsson F3607gw */
  	USB_DEVICE_AND_INTERFACE_INFO(0x0bdb, 0x1904, USB_CLASS_COMM,
  			USB_CDC_SUBCLASS_MDLM, USB_CDC_PROTO_NONE),
- 	.driver_info = (unsigned long) &cdc_info,
+ 	.driver_info = (unsigned long) &mbm_info,
  }, {
 -	/* Ericsson F3307 */
 +	/* Ericsson F3607gw ver 2 */
 +	USB_DEVICE_AND_INTERFACE_INFO(0x0bdb, 0x1905, USB_CLASS_COMM,
 +			USB_CDC_SUBCLASS_MDLM, USB_CDC_PROTO_NONE),
 +	.driver_info = (unsigned long) &cdc_info,
 +}, {
 +	/* Ericsson F3607gw ver 3 */
  	USB_DEVICE_AND_INTERFACE_INFO(0x0bdb, 0x1906, USB_CLASS_COMM,
  			USB_CDC_SUBCLASS_MDLM, USB_CDC_PROTO_NONE),
- 	.driver_info = (unsigned long) &cdc_info,
+ 	.driver_info = (unsigned long) &mbm_info,
  }, {
 +	/* Ericsson F3307 */
 +	USB_DEVICE_AND_INTERFACE_INFO(0x0bdb, 0x190a, USB_CLASS_COMM,
 +			USB_CDC_SUBCLASS_MDLM, USB_CDC_PROTO_NONE),
 +	.driver_info = (unsigned long) &cdc_info,
 +}, {
 +	/* Ericsson F3307 ver 2 */
 +	USB_DEVICE_AND_INTERFACE_INFO(0x0bdb, 0x1909, USB_CLASS_COMM,
 +			USB_CDC_SUBCLASS_MDLM, USB_CDC_PROTO_NONE),
 +	.driver_info = (unsigned long) &cdc_info,
 +}, {
 +	/* Ericsson C3607w */
 +	USB_DEVICE_AND_INTERFACE_INFO(0x0bdb, 0x1049, USB_CLASS_COMM,
 +			USB_CDC_SUBCLASS_MDLM, USB_CDC_PROTO_NONE),
 +	.driver_info = (unsigned long) &cdc_info,
 +}, {
  	/* Toshiba F3507g */
  	USB_DEVICE_AND_INTERFACE_INFO(0x0930, 0x130b, USB_CLASS_COMM,
  			USB_CDC_SUBCLASS_MDLM, USB_CDC_PROTO_NONE),
- 	.driver_info = (unsigned long) &cdc_info,
+ 	.driver_info = (unsigned long) &mbm_info,
  }, {
 +	/* Toshiba F3607gw */
 +	USB_DEVICE_AND_INTERFACE_INFO(0x0930, 0x130c, USB_CLASS_COMM,
 +			USB_CDC_SUBCLASS_MDLM, USB_CDC_PROTO_NONE),
 +	.driver_info = (unsigned long) &cdc_info,
 +}, {
 +	/* Toshiba F3607gw ver 2 */
 +	USB_DEVICE_AND_INTERFACE_INFO(0x0930, 0x1311, USB_CLASS_COMM,
 +			USB_CDC_SUBCLASS_MDLM, USB_CDC_PROTO_NONE),
 +	.driver_info = (unsigned long) &cdc_info,
 +}, {
  	/* Dell F3507g */
  	USB_DEVICE_AND_INTERFACE_INFO(0x413c, 0x8147, USB_CLASS_COMM,
  			USB_CDC_SUBCLASS_MDLM, USB_CDC_PROTO_NONE),
- 	.driver_info = (unsigned long) &cdc_info,
+ 	.driver_info = (unsigned long) &mbm_info,
 +}, {
 +	/* Dell F3607gw */
 +	USB_DEVICE_AND_INTERFACE_INFO(0x413c, 0x8183, USB_CLASS_COMM,
 +			USB_CDC_SUBCLASS_MDLM, USB_CDC_PROTO_NONE),
 +	.driver_info = (unsigned long) &cdc_info,
 +}, {
 +	/* Dell F3607gw ver 2 */
 +	USB_DEVICE_AND_INTERFACE_INFO(0x413c, 0x8184, USB_CLASS_COMM,
 +			USB_CDC_SUBCLASS_MDLM, USB_CDC_PROTO_NONE),
 +	.driver_info = (unsigned long) &cdc_info,
  },
  	{ },		// END
  };

^ permalink raw reply	[flat|nested] 116+ messages in thread
* linux-next: manual merge of the net tree with the net-current tree
@ 2009-08-14  2:40 Stephen Rothwell
  2009-08-14  2:50 ` David Miller
  0 siblings, 1 reply; 116+ messages in thread
From: Stephen Rothwell @ 2009-08-14  2:40 UTC (permalink / raw)
  To: David Miller
  Cc: linux-next, linux-kernel, Dhananjay Phadke, Amit Kumar Salecha

Hi David,

Today's linux-next merge of the net tree got a conflict in
drivers/net/netxen/netxen_nic_main.c between commits
e424fa9d6a0add1a9b812b07e3607daaa5b9e53d ("netxen: remove netxen
workqueue") and 232e7d68d50c9ac3a55d716e5ae215ecd1e043b9 ("netxen: free
napi resources during detach") from the net-current tree and commits
6598b169b856793f8f9b80a3f3c5a48f5eaf40e3 ("netxen: enable ip addr
hashing"), f17443f4b01659a5c44d5fc6f5c502c39c293959 ("netxen: refactor
net_device setup code") and 7042cd8f148345bfca6c336f009c96a416674f5e
("netxen: support for ethtool set ringparam") from the net tree.

I fixed it up (I hope) (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/net/netxen/netxen_nic_main.c
index 28f270f,98271f9..0000000
--- a/drivers/net/netxen/netxen_nic_main.c
+++ b/drivers/net/netxen/netxen_nic_main.c
@@@ -905,19 -923,15 +935,17 @@@ netxen_nic_attach(struct netxen_adapte
  	struct nx_host_rds_ring *rds_ring;
  	struct nx_host_tx_ring *tx_ring;
  
+ 	if (adapter->is_up == NETXEN_ADAPTER_UP_MAGIC)
+ 		return 0;
+ 
  	err = netxen_init_firmware(adapter);
 -	if (err != 0) {
 -		printk(KERN_ERR "Failed to init firmware\n");
 -		return -EIO;
 -	}
 +	if (err)
 +		return err;
 +
 +	err = netxen_napi_add(adapter, netdev);
 +	if (err)
 +		return err;
  
- 	if (adapter->fw_major < 4)
- 		adapter->max_rds_rings = 3;
- 	else
- 		adapter->max_rds_rings = 2;
- 
  	err = netxen_alloc_sw_resources(adapter);
  	if (err) {
  		printk(KERN_ERR "%s: Error in setting sw resources\n",
@@@ -981,6 -1000,95 +1015,91 @@@ netxen_nic_detach(struct netxen_adapte
  	adapter->is_up = 0;
  }
  
+ int
+ netxen_nic_reset_context(struct netxen_adapter *adapter)
+ {
+ 	int err = 0;
+ 	struct net_device *netdev = adapter->netdev;
+ 
+ 	if (adapter->is_up == NETXEN_ADAPTER_UP_MAGIC) {
+ 
+ 		if (netif_running(netdev))
+ 			netxen_nic_down(adapter, netdev);
+ 
+ 		netxen_nic_detach(adapter);
+ 
+ 		err = netxen_nic_attach(adapter);
+ 		if (err)
+ 			goto done;
+ 
+ 		if (netif_running(netdev))
+ 			err = netxen_nic_up(adapter, netdev);
+ 	}
+ done:
+ 	return err;
+ }
+ 
+ static int
+ netxen_setup_netdev(struct netxen_adapter *adapter,
+ 		struct net_device *netdev)
+ {
+ 	int err = 0;
+ 	struct pci_dev *pdev = adapter->pdev;
+ 
+ 	adapter->rx_csum = 1;
+ 	adapter->mc_enabled = 0;
+ 	if (NX_IS_REVISION_P3(adapter->ahw.revision_id))
+ 		adapter->max_mc_count = 38;
+ 	else
+ 		adapter->max_mc_count = 16;
+ 
+ 	netdev->netdev_ops	   = &netxen_netdev_ops;
+ 	netdev->watchdog_timeo     = 2*HZ;
+ 
+ 	netxen_nic_change_mtu(netdev, netdev->mtu);
+ 
+ 	SET_ETHTOOL_OPS(netdev, &netxen_nic_ethtool_ops);
+ 
+ 	netdev->features |= (NETIF_F_SG | NETIF_F_IP_CSUM | NETIF_F_TSO);
+ 	netdev->features |= (NETIF_F_GRO);
+ 	netdev->vlan_features |= (NETIF_F_SG | NETIF_F_IP_CSUM | NETIF_F_TSO);
+ 
+ 	if (NX_IS_REVISION_P3(adapter->ahw.revision_id)) {
+ 		netdev->features |= (NETIF_F_IPV6_CSUM | NETIF_F_TSO6);
+ 		netdev->vlan_features |= (NETIF_F_IPV6_CSUM | NETIF_F_TSO6);
+ 	}
+ 
+ 	if (adapter->pci_using_dac) {
+ 		netdev->features |= NETIF_F_HIGHDMA;
+ 		netdev->vlan_features |= NETIF_F_HIGHDMA;
+ 	}
+ 
+ 	if (adapter->capabilities & NX_FW_CAPABILITY_FVLANTX)
+ 		netdev->features |= (NETIF_F_HW_VLAN_TX);
+ 
+ 	netdev->irq = adapter->msix_entries[0].vector;
+ 
 -	err = netxen_napi_add(adapter, netdev);
 -	if (err)
 -		return err;
 -
+ 	init_timer(&adapter->watchdog_timer);
+ 	adapter->watchdog_timer.function = &netxen_watchdog;
+ 	adapter->watchdog_timer.data = (unsigned long)adapter;
+ 	INIT_WORK(&adapter->watchdog_task, netxen_watchdog_task);
+ 	INIT_WORK(&adapter->tx_timeout_task, netxen_reset_task);
+ 
+ 	if (netxen_read_mac_addr(adapter))
+ 		dev_warn(&pdev->dev, "failed to read mac addr\n");
+ 
+ 	netif_carrier_off(netdev);
+ 	netif_stop_queue(netdev);
+ 
+ 	err = register_netdev(netdev);
+ 	if (err) {
+ 		dev_err(&pdev->dev, "failed to register net device\n");
+ 		return err;
+ 	}
+ 
+ 	return 0;
+ }
+ 
  static int __devinit
  netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
  {
@@@ -1189,17 -1245,13 +1256,15 @@@ static void __devexit netxen_nic_remove
  
  	unregister_netdev(netdev);
  
 +	cancel_work_sync(&adapter->watchdog_task);
 +	cancel_work_sync(&adapter->tx_timeout_task);
 +
- 	if (adapter->is_up == NETXEN_ADAPTER_UP_MAGIC) {
- 		netxen_nic_detach(adapter);
- 	}
+ 	netxen_nic_detach(adapter);
  
  	if (adapter->portnum == 0)
- 		netxen_free_adapter_offload(adapter);
+ 		netxen_free_dummy_dma(adapter);
  
  	netxen_teardown_intr(adapter);
 -	netxen_free_sds_rings(&adapter->recv_ctx);
  
  	netxen_cleanup_pci_map(adapter);
  
@@@ -1225,11 -1277,7 +1290,10 @@@ netxen_nic_suspend(struct pci_dev *pdev
  	if (netif_running(netdev))
  		netxen_nic_down(adapter, netdev);
  
 +	cancel_work_sync(&adapter->watchdog_task);
 +	cancel_work_sync(&adapter->tx_timeout_task);
 +
- 	if (adapter->is_up == NETXEN_ADAPTER_UP_MAGIC)
- 		netxen_nic_detach(adapter);
+ 	netxen_nic_detach(adapter);
  
  	pci_save_state(pdev);
  
@@@ -1686,11 -1746,15 +1779,14 @@@ void netxen_watchdog_task(struct work_s
  
  static void netxen_tx_timeout(struct net_device *netdev)
  {
 -	struct netxen_adapter *adapter = (struct netxen_adapter *)
 -						netdev_priv(netdev);
 +	struct netxen_adapter *adapter = netdev_priv(netdev);
+ 
+ 	dev_err(&netdev->dev, "transmit timeout, resetting.\n");
+ 
 -	SCHEDULE_WORK(&adapter->tx_timeout_task);
 +	schedule_work(&adapter->tx_timeout_task);
  }
  
- static void netxen_tx_timeout_task(struct work_struct *work)
+ static void netxen_reset_task(struct work_struct *work)
  {
  	struct netxen_adapter *adapter =
  		container_of(work, struct netxen_adapter, tx_timeout_task);
@@@ -1844,6 -2025,14 +2057,11 @@@ static int __init netxen_init_module(vo
  {
  	printk(KERN_INFO "%s\n", netxen_nic_driver_string);
  
 -	if ((netxen_workq = create_singlethread_workqueue("netxen")) == NULL)
 -		return -ENOMEM;
 -
+ #ifdef CONFIG_INET
+ 	register_netdevice_notifier(&netxen_netdev_cb);
+ 	register_inetaddr_notifier(&netxen_inetaddr_cb);
+ #endif
+ 
  	return pci_register_driver(&netxen_driver);
  }
  
@@@ -1852,6 -2041,12 +2070,11 @@@ module_init(netxen_init_module)
  static void __exit netxen_exit_module(void)
  {
  	pci_unregister_driver(&netxen_driver);
+ 
+ #ifdef CONFIG_INET
+ 	unregister_inetaddr_notifier(&netxen_inetaddr_cb);
+ 	unregister_netdevice_notifier(&netxen_netdev_cb);
+ #endif
 -	destroy_workqueue(netxen_workq);
  }
  
  module_exit(netxen_exit_module);

^ permalink raw reply	[flat|nested] 116+ messages in thread
* linux-next: manual merge of the net tree with the net-current tree
@ 2009-03-16  5:05 Stephen Rothwell
  2009-03-16  6:41 ` Kirsher, Jeffrey T
  0 siblings, 1 reply; 116+ messages in thread
From: Stephen Rothwell @ 2009-03-16  5:05 UTC (permalink / raw)
  To: David Miller; +Cc: linux-next, Alexander Duyck, Jeff Kirsher

Hi David,

Today's linux-next merge of the net tree got a conflict in
drivers/net/igb/igb_main.c between commit
682337fe062e939578d933c74157ae9a36baa4ce ("igb: remove ASPM L0s
workaround") from the net-current tree and commits
aed5dec370e294233d647251ce1e5f74d70b09c9 ("igb: remove check for needing
an io port") and 450c87c8d28aeaf83889389ceeb01457c1a6f3e9 ("igb: remove
redundant count set and err_hw_init") from the net tree.

I fixed it up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

diff --cc drivers/net/igb/igb_main.c
index 9dd13ad,7124f59..0000000
--- a/drivers/net/igb/igb_main.c
+++ b/drivers/net/igb/igb_main.c
@@@ -1023,23 -1128,15 +1128,14 @@@ static int __devinit igb_probe(struct p
  	struct net_device *netdev;
  	struct igb_adapter *adapter;
  	struct e1000_hw *hw;
 -	struct pci_dev *us_dev;
  	const struct e1000_info *ei = igb_info_tbl[ent->driver_data];
  	unsigned long mmio_start, mmio_len;
- 	int i, err, pci_using_dac;
 -	int err, pci_using_dac, pos;
 -	u16 eeprom_data = 0, state = 0;
++	int err, pci_using_dac;
 +	u16 eeprom_data = 0;
  	u16 eeprom_apme_mask = IGB_EEPROM_APME;
  	u32 part_num;
- 	int bars, need_ioport;
  
- 	/* do not allocate ioport bars when not needed */
- 	need_ioport = igb_is_need_ioport(pdev);
- 	if (need_ioport) {
- 		bars = pci_select_bars(pdev, IORESOURCE_MEM | IORESOURCE_IO);
- 		err = pci_enable_device(pdev);
- 	} else {
- 		bars = pci_select_bars(pdev, IORESOURCE_MEM);
- 		err = pci_enable_device_mem(pdev);
- 	}
+ 	err = pci_enable_device_mem(pdev);
  	if (err)
  		return err;
  
@@@ -1061,7 -1158,30 +1157,9 @@@
  		}
  	}
  
- 	err = pci_request_selected_regions(pdev, bars, igb_driver_name);
 -	/* 82575 requires that the pci-e link partner disable the L0s state */
 -	switch (pdev->device) {
 -	case E1000_DEV_ID_82575EB_COPPER:
 -	case E1000_DEV_ID_82575EB_FIBER_SERDES:
 -	case E1000_DEV_ID_82575GB_QUAD_COPPER:
 -		us_dev = pdev->bus->self;
 -		pos = pci_find_capability(us_dev, PCI_CAP_ID_EXP);
 -		if (pos) {
 -			pci_read_config_word(us_dev, pos + PCI_EXP_LNKCTL,
 -			                     &state);
 -			state &= ~PCIE_LINK_STATE_L0S;
 -			pci_write_config_word(us_dev, pos + PCI_EXP_LNKCTL,
 -			                      state);
 -			dev_info(&pdev->dev,
 -				 "Disabling ASPM L0s upstream switch port %s\n",
 -				 pci_name(us_dev));
 -		}
 -	default:
 -		break;
 -	}
 -
+ 	err = pci_request_selected_regions(pdev, pci_select_bars(pdev,
+ 	                                   IORESOURCE_MEM),
+ 	                                   igb_driver_name);
  	if (err)
  		goto err_pci_reg;
  

^ permalink raw reply	[flat|nested] 116+ messages in thread
* linux-next: manual merge of the net tree with the net-current tree
@ 2009-02-12  2:46 Stephen Rothwell
  2009-02-15  7:12 ` David Miller
  0 siblings, 1 reply; 116+ messages in thread
From: Stephen Rothwell @ 2009-02-12  2:46 UTC (permalink / raw)
  To: David Miller; +Cc: linux-next, Reinette Chatre, John W. Linville

[-- Attachment #1: Type: text/plain, Size: 819 bytes --]

Hi David,

Today's linux-next merge of the net tree got conflicts in
drivers/net/wireless/iwlwifi/iwl-agn.c and
drivers/net/wireless/iwlwifi/iwl3945-base.c between commit
89c581b3fb2986e303f1299e6458e3e9b115fa3f ("iwlwifi: fix suspend/resume
and its usage of pci saved state") from the net-current tree and commits
from the net tree.

I assume this is what John was referring to when he said:

> The iwlwifi patch corrects a problem (introduced by the previous iwlwifi
> fix) that disables the iwlwifi devices after suspend/resume.  It will
> conflict with what is already in -next -- just take the hunks that are
> already in -next and ignore the hunks introduced here.

So I took that advise.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

^ permalink raw reply	[flat|nested] 116+ messages in thread
end of thread, other threads:[~2011-09-28  5:39 UTC | newest]

Thread overview: 116+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-11-23  1:00 linux-next: manual merge of the net tree with the net-current tree Stephen Rothwell
2009-11-23  1:00 ` Stephen Rothwell
2009-11-23 18:09 ` Amit Salecha
2009-11-23 23:17   ` Stephen Rothwell
  -- strict thread matches above, loose matches on Subject: below --
2011-09-28  2:54 Stephen Rothwell
2011-09-28  2:54 ` Stephen Rothwell
2011-09-28  5:36 ` David Miller
2011-06-20  2:56 Stephen Rothwell
2011-06-20  2:56 ` Stephen Rothwell
2011-06-20  3:39 ` Simon Horman
2011-06-20  4:26   ` David Miller
2011-05-17  2:01 Stephen Rothwell
2011-05-17  2:01 ` Stephen Rothwell
2011-05-10  1:49 Stephen Rothwell
2011-05-10  1:49 ` Stephen Rothwell
2011-05-10 11:55 ` Sathya.Perla
2011-05-10 11:55   ` Sathya.Perla
2011-05-03  3:15 Stephen Rothwell
2011-05-03  3:15 ` Stephen Rothwell
2011-05-03  3:42 ` David Miller
2011-05-03  4:21   ` Stephen Rothwell
2011-04-19  3:16 Stephen Rothwell
2011-04-19  3:16 ` Stephen Rothwell
2011-04-19  7:41 ` David Miller
2011-04-07  1:39 Stephen Rothwell
2011-04-07  1:39 ` Stephen Rothwell
2011-04-07 20:48 ` David Miller
2011-03-08  3:09 Stephen Rothwell
2011-03-08  3:09 ` Stephen Rothwell
2011-03-08  9:44 ` Dmitry Kravkov
2011-03-09  0:11   ` Stephen Rothwell
2011-03-03  2:40 Stephen Rothwell
2011-03-03  2:40 ` Stephen Rothwell
2011-02-18  1:20 Stephen Rothwell
2011-02-18  1:20 ` Stephen Rothwell
2011-02-09  0:56 Stephen Rothwell
2011-02-09  0:56 ` Stephen Rothwell
2011-02-09  1:06 ` David Miller
2010-12-15  0:45 Stephen Rothwell
2010-12-15  0:45 ` Stephen Rothwell
2010-11-19  0:17 Stephen Rothwell
2010-11-19  0:17 ` Stephen Rothwell
2010-11-19 21:14 ` David Miller
2010-11-19  0:17 Stephen Rothwell
2010-11-19  0:17 ` Stephen Rothwell
2010-11-19 21:11 ` David Miller
2010-10-07  1:31 Stephen Rothwell
2010-10-07  1:31 ` Stephen Rothwell
2010-10-07  2:35 ` David Miller
2010-10-01  2:48 Stephen Rothwell
2010-10-01  2:48 ` Stephen Rothwell
2010-10-01  2:48 Stephen Rothwell
2010-10-01  2:48 ` Stephen Rothwell
2010-10-01  3:27 ` Jerry Chu
2010-10-05  5:47   ` David Miller
2010-09-23  2:14 Stephen Rothwell
2010-09-23  2:14 ` Stephen Rothwell
2010-08-02  1:04 Stephen Rothwell
2010-08-02  1:04 ` Stephen Rothwell
2010-08-02  1:04 ` Stephen Rothwell
2010-07-29  1:19 Stephen Rothwell
2010-07-29  1:19 ` Stephen Rothwell
2010-07-29  1:26 ` Jeff Kirsher
2010-07-29  1:26   ` Jeff Kirsher
2010-07-29  1:05 Stephen Rothwell
2010-07-29  1:05 ` Stephen Rothwell
2010-07-29  5:51 ` Jiri Pirko
2010-07-20  2:20 Stephen Rothwell
2010-07-20  2:20 ` Stephen Rothwell
2010-07-20  2:34 ` Joe Perches
2010-07-21  1:27   ` David Miller
2010-06-23  2:51 Stephen Rothwell
2010-06-23  2:51 ` Stephen Rothwell
2010-06-23  2:51 ` Stephen Rothwell
2010-06-23  4:14 ` Herbert Xu
2010-06-23  4:14   ` Herbert Xu
2010-06-25 18:22 ` David Miller
2010-06-25 18:22   ` David Miller
2010-06-15  2:00 Stephen Rothwell
2010-06-15  2:00 ` Stephen Rothwell
2009-11-24  3:11 Stephen Rothwell
2009-11-24  3:11 ` Stephen Rothwell
2009-11-30  1:12 ` David Miller
2009-11-24  3:11 Stephen Rothwell
2009-11-24  3:11 ` Stephen Rothwell
2009-11-25  7:52 ` Jeff Kirsher
2009-11-25  7:52   ` Jeff Kirsher
2009-11-30  1:11 ` David Miller
2009-11-30  2:46   ` Stephen Rothwell
2009-11-23  1:00 Stephen Rothwell
2009-11-23  1:00 ` Stephen Rothwell
2009-11-23  1:19 ` David Miller
2009-11-23  2:04   ` Stephen Rothwell
2009-11-23  2:11     ` David Miller
2009-11-17  2:16 Stephen Rothwell
2009-11-17  2:16 ` Stephen Rothwell
2009-11-17  8:00 ` Oliver Hartkopp
2009-11-17  8:16   ` Stephen Rothwell
2009-11-17  8:07 ` David Miller
2009-11-17  8:10   ` Stephen Rothwell
2009-11-09  2:03 Stephen Rothwell
2009-11-09  2:03 ` Stephen Rothwell
2009-11-09  4:59 ` David Miller
2009-11-06  0:55 Stephen Rothwell
2009-11-06  0:55 ` Stephen Rothwell
2009-11-06  1:40 ` David Miller
2009-11-06  2:32   ` Stephen Rothwell
2009-08-14  2:40 Stephen Rothwell
2009-08-14  2:50 ` David Miller
2009-08-14  4:19   ` Stephen Rothwell
2009-08-14  5:27   ` Dhananjay Phadke
2009-03-16  5:05 Stephen Rothwell
2009-03-16  6:41 ` Kirsher, Jeffrey T
2009-03-16  8:19   ` Stephen Rothwell
2009-02-12  2:46 Stephen Rothwell
2009-02-15  7:12 ` David Miller

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.