summaryrefslogtreecommitdiff
path: root/pkt_buff.h
diff options
context:
space:
mode:
authorTobias Klauser <tklauser@distanz.ch>2015-04-21 17:57:10 +0200
committerTobias Klauser <tklauser@distanz.ch>2015-04-21 17:58:29 +0200
commit04875e8ea51a18dd1466ed7cb5d425c158db4337 (patch)
tree22ea9ff080c8aa65d8db18757662e50d03650d9a /pkt_buff.h
parent7aebca65f569ceb5fd8a12bef5fa6b58f277683d (diff)
ring: Make ifname paramter to ring_size() const
ifname not changed inside the function, so make it const. Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
Diffstat (limited to 'pkt_buff.h')
0 files changed, 0 insertions, 0 deletions
et-next.git/diff/net/ipv6/udp.c?h=nds-private-remove&id=3efa70d78f218e4c9276b0bac0545e5184c1c47b&id2=926af6273fc683cd98cd0ce7bf0d04a02eed6742'>diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
The conflict was an interaction between a bug fix in the netvsc driver in 'net' and an optimization of the RX path in 'net-next'. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/udp.c')