Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9f381a61 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (27 commits)
  slcan: fix ldisc->open retval
  net/usb: mark LG VL600 LTE modem ethernet interface as WWAN
  xfrm: Don't allow esn with disabled anti replay detection
  xfrm: Assign the inner mode output function to the dst entry
  net: dev_close() should check IFF_UP
  vlan: fix GVRP at dismantle time
  netfilter: revert a2361c87
  netfilter: IPv6: fix DSCP mangle code
  netfilter: IPv6: initialize TOS field in REJECT target module
  IPVS: init and cleanup restructuring
  IPVS: Change of socket usage to enable name space exit.
  netfilter: ebtables: only call xt_compat_add_offset once per rule
  netfilter: fix ebtables compat support
  netfilter: ctnetlink: fix timestamp support for new conntracks
  pch_gbe: support ML7223 IOH
  PCH_GbE : Fixed the issue of checksum judgment
  PCH_GbE : Fixed the issue of collision detection
  NET: slip, fix ldisc->open retval
  be2net: Fixed bugs related to PVID.
  ehea: fix wrongly reported speed and port
  ...
parents 21a43e39 9bbc052d

drivers/net/Kconfig

+7 −1
Original line number Diff line number Diff line
@@ -2536,7 +2536,7 @@ config S6GMAC 
source "drivers/net/stmmac/Kconfig"



config PCH_GBE

	tristate "PCH Gigabit Ethernet"

	tristate "Intel EG20T PCH / OKI SEMICONDUCTOR ML7223 IOH GbE"

	depends on PCI

	select MII

	---help---
@@ -2548,6 +2548,12 @@ config PCH_GBE 
	  to Gigabit Ethernet.

	  This driver enables Gigabit Ethernet function.



	  This driver also can be used for OKI SEMICONDUCTOR IOH(Input/

	  Output Hub), ML7223.

	  ML7223 IOH is for MP(Media Phone) use.

	  ML7223 is companion chip for Intel Atom E6xx series.

	  ML7223 is completely compatible for Intel EG20T PCH.



endif # NETDEV_1000



#

drivers/net/benet/be.h

+1 −1
Original line number Diff line number Diff line
@@ -213,7 +213,7 @@ struct be_rx_stats { 


struct be_rx_compl_info {

	u32 rss_hash;

	u16 vid;

	u16 vlan_tag;

	u16 pkt_size;

	u16 rxq_idx;

	u16 mac_id;

drivers/net/benet/be_cmds.c

+1 −1
Original line number Diff line number Diff line
@@ -132,7 +132,7 @@ static void be_async_grp5_pvid_state_process(struct be_adapter *adapter, 
		struct be_async_event_grp5_pvid_state *evt)

{

	if (evt->enabled)

		adapter->pvid = evt->tag;

		adapter->pvid = le16_to_cpu(evt->tag);

	else

		adapter->pvid = 0;

}

drivers/net/benet/be_main.c

+12 −6
Original line number Diff line number Diff line
@@ -1018,7 +1018,8 @@ static void be_rx_compl_process(struct be_adapter *adapter, 
			kfree_skb(skb);

			return;

		}

		vlan_hwaccel_receive_skb(skb, adapter->vlan_grp, rxcp->vid);

		vlan_hwaccel_receive_skb(skb, adapter->vlan_grp,

					rxcp->vlan_tag);

	} else {

		netif_receive_skb(skb);

	}
@@ -1076,7 +1077,8 @@ static void be_rx_compl_process_gro(struct be_adapter *adapter, 
	if (likely(!rxcp->vlanf))

		napi_gro_frags(&eq_obj->napi);

	else

		vlan_gro_frags(&eq_obj->napi, adapter->vlan_grp, rxcp->vid);

		vlan_gro_frags(&eq_obj->napi, adapter->vlan_grp,

				rxcp->vlan_tag);

}



static void be_parse_rx_compl_v1(struct be_adapter *adapter,
@@ -1102,7 +1104,8 @@ static void be_parse_rx_compl_v1(struct be_adapter *adapter, 
	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->vid = AMAP_GET_BITS(struct amap_eth_rx_compl_v1, vlan_tag, compl);

	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,
@@ -1128,7 +1131,8 @@ static void be_parse_rx_compl_v0(struct be_adapter *adapter, 
	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->vid = AMAP_GET_BITS(struct amap_eth_rx_compl_v0, vlan_tag, compl);

	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)
@@ -1155,9 +1159,11 @@ static struct be_rx_compl_info *be_rx_compl_get(struct be_rx_obj *rxo) 
		rxcp->vlanf = 0;



	if (!lancer_chip(adapter))

		rxcp->vid = swab16(rxcp->vid);

		rxcp->vlan_tag = swab16(rxcp->vlan_tag);



	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 */

drivers/net/can/sja1000/sja1000.c

+1 −1
Original line number Diff line number Diff line
@@ -346,10 +346,10 @@ static void sja1000_rx(struct net_device *dev) 
		    | (priv->read_reg(priv, REG_ID2) >> 5);

	}



	cf->can_dlc = get_can_dlc(fi & 0x0F);

	if (fi & FI_RTR) {

		id |= CAN_RTR_FLAG;

	} else {

		cf->can_dlc = get_can_dlc(fi & 0x0F);

		for (i = 0; i < cf->can_dlc; i++)

			cf->data[i] = priv->read_reg(priv, dreg++);

	}