diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-06-25 10:53:16 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-06-25 10:53:16 +1000 |
| commit | 897a046ad7c754386b6a248b520959bcba076271 (patch) | |
| tree | e8de35e657a5a678e1e1278c08060cea58e370b3 /net/mpls | |
| parent | 3d3a528b42c516e750a4f7b1780c7ad58ae37f82 (diff) | |
| parent | 1ea2d020ba477cb7011a7174e8501a9e04a325d4 (diff) | |
Merge remote-tracking branch 'net-next/master'
Conflicts:
drivers/infiniband/hw/mlx4/mad.c
drivers/infiniband/hw/mlx5/main.c
drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
drivers/net/ethernet/chelsio/cxgb4/sge.c
drivers/target/target_core_user.c
Diffstat (limited to 'net/mpls')
| -rw-r--r-- | net/mpls/mpls_gso.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/mpls/mpls_gso.c b/net/mpls/mpls_gso.c index 809df534a720..0183b32da942 100644 --- a/net/mpls/mpls_gso.c +++ b/net/mpls/mpls_gso.c @@ -62,6 +62,7 @@ out: static struct packet_offload mpls_mc_offload __read_mostly = { .type = cpu_to_be16(ETH_P_MPLS_MC), + .priority = 15, .callbacks = { .gso_segment = mpls_gso_segment, }, @@ -69,6 +70,7 @@ static struct packet_offload mpls_mc_offload __read_mostly = { static struct packet_offload mpls_uc_offload __read_mostly = { .type = cpu_to_be16(ETH_P_MPLS_UC), + .priority = 15, .callbacks = { .gso_segment = mpls_gso_segment, }, |