summaryrefslogtreecommitdiff
path: root/ifpps/.gitignore
diff options
context:
space:
mode:
authorDaniel Borkmann <dborkman@redhat.com>2013-07-11 17:21:09 +0200
committerDaniel Borkmann <dborkman@redhat.com>2013-07-11 17:21:09 +0200
commit4c139be17d5d26a1bba81c0775ca5c8fb3a6b181 (patch)
tree693ce5ee2e0d565f5b593d6a2cb89e6dfd2e70b2 /ifpps/.gitignore
parentf1c783dc1c66b8868f011f327bf4e113a05f18f7 (diff)
link: allow future ethtool speed formats to be supported
In case some in the near future NICs with 40Gbit/s will appear. Allow ifpps to get the correct ethtool speed. Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
Diffstat (limited to 'ifpps/.gitignore')
0 files changed, 0 insertions, 0 deletions
href='/cgit.cgi/linux/net-next.git/diff/tools/lib/traceevent/Makefile?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 'tools/lib/traceevent/Makefile')