diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-07-28 12:42:57 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-07-28 12:43:02 +1000 |
| commit | 7a9b2e72187269878e925c19c287c479bf2f1f85 (patch) | |
| tree | d35981c6b3433cbe94d6f45f974b8fe0dd824189 /arch | |
| parent | 2a79a1fea6a4bdfb45845b7c1d61c194b9d45e3a (diff) | |
| parent | ac3d2e5a9ef2f4d8f57c50070c4883ecb7cec29f (diff) | |
Merge remote-tracking branch 'net-next/master'
Conflicts:
drivers/net/wireless/iwlwifi/mvm/mac80211.c
net/mac80211/cfg.c
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boot/dts/sama5d3_gmac.dtsi | 2 | ||||
| -rw-r--r-- | arch/x86/net/bpf_jit_comp.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/sama5d3_gmac.dtsi b/arch/arm/boot/dts/sama5d3_gmac.dtsi index a6cb0508762f..de5ed59fb446 100644 --- a/arch/arm/boot/dts/sama5d3_gmac.dtsi +++ b/arch/arm/boot/dts/sama5d3_gmac.dtsi @@ -74,7 +74,7 @@ }; macb0: ethernet@f0028000 { - compatible = "cdns,pc302-gem", "cdns,gem"; + compatible = "atmel,sama5d3-gem"; reg = <0xf0028000 0x100>; interrupts = <34 IRQ_TYPE_LEVEL_HIGH 3>; pinctrl-names = "default"; diff --git a/arch/x86/net/bpf_jit_comp.c b/arch/x86/net/bpf_jit_comp.c index 99bef86ed6df..71737a83f022 100644 --- a/arch/x86/net/bpf_jit_comp.c +++ b/arch/x86/net/bpf_jit_comp.c @@ -214,7 +214,7 @@ struct jit_context { static int do_jit(struct sk_filter *bpf_prog, int *addrs, u8 *image, int oldproglen, struct jit_context *ctx) { - struct sock_filter_int *insn = bpf_prog->insnsi; + struct bpf_insn *insn = bpf_prog->insnsi; int insn_cnt = bpf_prog->len; u8 temp[64]; int i; |