Commit 3a07bd6f authored by David S. Miller's avatar David S. Miller
Browse files

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



Conflicts:
	drivers/net/ethernet/mellanox/mlx4/main.c
	net/packet/af_packet.c

Both conflicts were cases of simple overlapping changes.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 20462155 f1590670

drivers/isdn/hisax/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -237,7 +237,7 @@ config HISAX_MIC 


config HISAX_NETJET

	bool "NETjet card"

	depends on PCI && (BROKEN || !(PPC || PARISC || M68K || (MIPS && !CPU_LITTLE_ENDIAN) || FRV || (XTENSA && !CPU_LITTLE_ENDIAN)))

	depends on PCI && (BROKEN || !(PPC || PARISC || M68K || (MIPS && !CPU_LITTLE_ENDIAN) || FRV || (XTENSA && !CPU_LITTLE_ENDIAN) || MICROBLAZE))

	depends on VIRT_TO_BUS

	help

	  This enables HiSax support for the NetJet from Traverse
@@ -249,7 +249,7 @@ config HISAX_NETJET 


config HISAX_NETJET_U

	bool "NETspider U card"

	depends on PCI && (BROKEN || !(PPC || PARISC || M68K || (MIPS && !CPU_LITTLE_ENDIAN) || FRV || (XTENSA && !CPU_LITTLE_ENDIAN)))

	depends on PCI && (BROKEN || !(PPC || PARISC || M68K || (MIPS && !CPU_LITTLE_ENDIAN) || FRV || (XTENSA && !CPU_LITTLE_ENDIAN) || MICROBLAZE))

	depends on VIRT_TO_BUS

	help

	  This enables HiSax support for the Netspider U interface ISDN card

drivers/net/can/dev.c

+5 −0
Original line number Diff line number Diff line
@@ -440,6 +440,9 @@ unsigned int can_get_echo_skb(struct net_device *dev, unsigned int idx) 
		struct can_frame *cf = (struct can_frame *)skb->data;

		u8 dlc = cf->can_dlc;



		if (!(skb->tstamp.tv64))

			__net_timestamp(skb);



		netif_rx(priv->echo_skb[idx]);

		priv->echo_skb[idx] = NULL;
@@ -575,6 +578,7 @@ struct sk_buff *alloc_can_skb(struct net_device *dev, struct can_frame **cf) 
	if (unlikely(!skb))

		return NULL;



	__net_timestamp(skb);

	skb->protocol = htons(ETH_P_CAN);

	skb->pkt_type = PACKET_BROADCAST;

	skb->ip_summed = CHECKSUM_UNNECESSARY;
@@ -603,6 +607,7 @@ struct sk_buff *alloc_canfd_skb(struct net_device *dev, 
	if (unlikely(!skb))

		return NULL;



	__net_timestamp(skb);

	skb->protocol = htons(ETH_P_CANFD);

	skb->pkt_type = PACKET_BROADCAST;

	skb->ip_summed = CHECKSUM_UNNECESSARY;

drivers/net/can/slcan.c

+1 −0
Original line number Diff line number Diff line
@@ -207,6 +207,7 @@ static void slc_bump(struct slcan *sl) 
	if (!skb)

		return;



	__net_timestamp(skb);

	skb->dev = sl->dev;

	skb->protocol = htons(ETH_P_CAN);

	skb->pkt_type = PACKET_BROADCAST;

drivers/net/can/vcan.c

+3 −0
Original line number Diff line number Diff line
@@ -78,6 +78,9 @@ static void vcan_rx(struct sk_buff *skb, struct net_device *dev) 
	skb->dev       = dev;

	skb->ip_summed = CHECKSUM_UNNECESSARY;



	if (!(skb->tstamp.tv64))

		__net_timestamp(skb);



	netif_rx_ni(skb);

}

drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c

+23 −3
Original line number Diff line number Diff line
@@ -487,6 +487,9 @@ static struct sk_buff *tx_skb_align_workaround(struct net_device *dev, 
{

	struct sk_buff *new_skb;



	if (skb_linearize(skb))

		return NULL;



	/* Alloc new skb */

	new_skb = netdev_alloc_skb(dev, skb->len + 4);

	if (!new_skb)
@@ -512,12 +515,27 @@ static int fs_enet_start_xmit(struct sk_buff *skb, struct net_device *dev) 
	cbd_t __iomem *bdp;

	int curidx;

	u16 sc;

	int nr_frags = skb_shinfo(skb)->nr_frags;

	int nr_frags;

	skb_frag_t *frag;

	int len;



#ifdef CONFIG_FS_ENET_MPC5121_FEC

	if (((unsigned long)skb->data) & 0x3) {

	int is_aligned = 1;

	int i;



	if (!IS_ALIGNED((unsigned long)skb->data, 4)) {

		is_aligned = 0;

	} else {

		nr_frags = skb_shinfo(skb)->nr_frags;

		frag = skb_shinfo(skb)->frags;

		for (i = 0; i < nr_frags; i++, frag++) {

			if (!IS_ALIGNED(frag->page_offset, 4)) {

				is_aligned = 0;

				break;

			}

		}

	}



	if (!is_aligned) {

		skb = tx_skb_align_workaround(dev, skb);

		if (!skb) {

			/*
@@ -529,6 +547,7 @@ static int fs_enet_start_xmit(struct sk_buff *skb, struct net_device *dev) 
		}

	}

#endif



	spin_lock(&fep->tx_lock);



	/*
@@ -536,6 +555,7 @@ static int fs_enet_start_xmit(struct sk_buff *skb, struct net_device *dev) 
	 */

	bdp = fep->cur_tx;



	nr_frags = skb_shinfo(skb)->nr_frags;

	if (fep->tx_free <= nr_frags || (CBDR_SC(bdp) & BD_ENET_TX_READY)) {

		netif_stop_queue(dev);

		spin_unlock(&fep->tx_lock);