Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-3.6 (3c709f8f) · Commits · e / devices / android_kernel_fairphone_FP5

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
		@@ -212,7 +212,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
		@@ -133,7 +133,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

+14 −11

Original line number	Diff line number	Diff line
		@@ -1017,7 +1017,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);
		}
		@@ -1077,7 +1078,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,
		@@ -1107,7 +1109,7 @@ static void be_parse_rx_compl_v1(struct be_adapter *adapter,
		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);
		}
		}
		@@ -1139,7 +1141,7 @@ static void be_parse_rx_compl_v0(struct be_adapter *adapter,
		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);
		}
		}
		@@ -1170,10 +1172,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;
		}

drivers/net/can/slcan.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -583,7 +583,9 @@ static int slcan_open(struct tty_struct *tty)
		/* Done. We have linked the TTY line to a channel. */
		rtnl_unlock();
		tty->receive_room = 65536; /* We don't flow control */
		return sl->dev->base_addr;

		/* TTY layer expects 0 on success */
		return 0;

		err_free_chan:
		sl->tty = NULL;