From: David S. Miller <davem@davemloft.net>
Date: Thu, 24 Apr 2014 17:19:00 +0000 (-0400)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
X-Git-Tag: next-20140428~51^2~14
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=4366004d77278a90c18f92f7cb9ec0c264da563d;p=karo-tx-linux.git

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

Conflicts:
	drivers/net/ethernet/intel/igb/e1000_mac.c
	net/core/filter.c

Both conflicts were simple overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
---

4366004d77278a90c18f92f7cb9ec0c264da563d
diff --cc net/core/filter.c
index 78a636e60a0b,9d79ca0a6e8e..7c4db3dd3d1e
--- a/net/core/filter.c
+++ b/net/core/filter.c
@@@ -643,19 -652,6 +652,12 @@@ static u64 __get_raw_cpu_id(u64 ctx, u6
  	return raw_smp_processor_id();
  }
  
 +/* note that this only generates 32-bit random numbers */
 +static u64 __get_random_u32(u64 ctx, u64 A, u64 X, u64 r4, u64 r5)
 +{
 +	return (u64)prandom_u32();
 +}
 +
- /* Register mappings for user programs. */
- #define A_REG		0
- #define X_REG		7
- #define TMP_REG		8
- #define ARG2_REG	2
- #define ARG3_REG	3
- 
  static bool convert_bpf_extensions(struct sock_filter *fp,
  				   struct sock_filter_int **insnp)
  {