diff options
| author | David S. Miller <davem@davemloft.net> | 2013-12-10 05:20:14 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-12-10 05:20:14 +0400 |
| commit | 34f9f437104b86f6ddfa2770e2cd852846385dc3 (patch) | |
| tree | 6c78386b3db9dd47fd2b79efb4dcf8c1472de99e /net/sched/act_skbedit.c | |
| parent | 95dc19299f741c986227ec33e23cbf9b3321f812 (diff) | |
| parent | 66e56cd46b93ef407c60adcac62cf33b06119d50 (diff) | |
| download | linux-34f9f437104b86f6ddfa2770e2cd852846385dc3.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Merge 'net' into 'net-next' to get the AF_PACKET bug fix that
Daniel's direct transmit changes depend upon.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sched/act_skbedit.c')
| -rw-r--r-- | net/sched/act_skbedit.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/sched/act_skbedit.c b/net/sched/act_skbedit.c index 9119b73527c9..cf20add1c3ff 100644 --- a/net/sched/act_skbedit.c +++ b/net/sched/act_skbedit.c @@ -202,7 +202,6 @@ static struct tc_action_ops act_skbedit_ops = { .dump = tcf_skbedit_dump, .cleanup = tcf_skbedit_cleanup, .init = tcf_skbedit_init, - .walk = tcf_generic_walker, }; MODULE_AUTHOR("Alexander Duyck, <alexander.h.duyck@intel.com>"); |