summaryrefslogtreecommitdiff
BranchCommit messageAuthorAge
emaclite-cleanupnet: xilinx: emaclite: Remove net_device pointer from struct net_localTobias Klauser8 years
masterMerge tag 'docs-4.10' of git://git.lwn.net/linuxLinus Torvalds8 years
nds-private-removeusbnet: pegasus: Use net_device_stats from struct net_deviceTobias Klauser8 years
packet-loop-backnet: packet: Introduce PACKET_XMIT_RECEIVE socket optionTobias Klauser8 years
packet-rx-pump-backnet: packet: Introduce PACKET_RX_PUMP_BACK socket optionTobias Klauser8 years
 
/net-next.git/tree/?id=92e55f412cffd016cc245a74278cb4d7b89bb3bc'>ab90e2e59c82daae60d2c953ef6c780e1f6e5550 /net parenta47b70ea86bdeb3091341f5ae3ef580f1a1ad822 (diff)
tcp: don't annotate mark on control socket from tcp_v6_send_response()
Unlike ipv4, this control socket is shared by all cpus so we cannot use it as scratchpad area to annotate the mark that we pass to ip6_xmit(). Add a new parameter to ip6_xmit() to indicate the mark. The SCTP socket family caches the flowi6 structure in the sctp_transport structure, so we cannot use to carry the mark unless we later on reset it back, which I discarded since it looks ugly to me. Fixes: bf99b4ded5f8 ("tcp: fix mark propagation with fwmark_reflect enabled") Suggested-by: Eric Dumazet <eric.dumazet@gmail.com> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')