summaryrefslogtreecommitdiff
path: root/staging/cli.c
diff options
context:
space:
mode:
authorTobias Klauser <tklauser@distanz.ch>2016-01-29 14:41:28 +0100
committerTobias Klauser <tklauser@distanz.ch>2016-01-29 14:42:25 +0100
commitf711e3c80a35e0762c719c0ef35fddfa35d92bbd (patch)
treeb89e09c60200afb5cba0b7337ec50dab6a06b60b /staging/cli.c
parent2ba202b8320cbec32520d347ac256c2b4caf0458 (diff)
trafgen: l2: Make needlessly global symbol eth_fields static
This fixes the following sparse warning: trafgen_l2.c:13:20: warning: symbol 'eth_fields' was not declared. Should it be static? Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
Diffstat (limited to 'staging/cli.c')
0 files changed, 0 insertions, 0 deletions
remove&id=926af6273fc683cd98cd0ce7bf0d04a02eed6742'>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/tipc/server.c')