From: David S. Miller Date: Tue, 22 Jul 2014 03:22:52 +0000 (-0700) Subject: Merge branch 'enic-next' X-Git-Tag: firefly_0821_release~176^2~3474^2~113 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=bc3bd3f41480d378b12ba6f1c16fd3310815ad1d;p=firefly-linux-kernel-4.4.55.git Merge branch 'enic-next' Govindarajulu Varadarajan says: ==================== enic: Display classifier filters using ethtool This series adds ethtool support to show classifier filters added by driver. v2: The patch 1/2 removes the $ifdef's around the filter structure. Making it available always. So that .get_rxnfc() can be implimented without any #ifdefs ==================== Signed-off-by: David S. Miller --- bc3bd3f41480d378b12ba6f1c16fd3310815ad1d