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

Commit 18f22fbb 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:
  netdev: simple_tx_hash shouldn't hash inside fragments
parents 72d31053 ad55dcaf

net/core/dev.c

+4 −2
Original line number Diff line number Diff line
@@ -122,6 +122,7 @@ 
#include <linux/if_arp.h>

#include <linux/if_vlan.h>

#include <linux/ip.h>

#include <net/ip.h>

#include <linux/ipv6.h>

#include <linux/in.h>

#include <linux/jhash.h>
@@ -1667,7 +1668,7 @@ static u16 simple_tx_hash(struct net_device *dev, struct sk_buff *skb) 
{

	u32 addr1, addr2, ports;

	u32 hash, ihl;

	u8 ip_proto;

	u8 ip_proto = 0;



	if (unlikely(!simple_tx_hashrnd_initialized)) {

		get_random_bytes(&simple_tx_hashrnd, 4);
@@ -1676,6 +1677,7 @@ static u16 simple_tx_hash(struct net_device *dev, struct sk_buff *skb) 


	switch (skb->protocol) {

	case __constant_htons(ETH_P_IP):

		if (!(ip_hdr(skb)->frag_off & htons(IP_MF | IP_OFFSET)))

			ip_proto = ip_hdr(skb)->protocol;

		addr1 = ip_hdr(skb)->saddr;

		addr2 = ip_hdr(skb)->daddr;