summaryrefslogtreecommitdiff
path: root/include/net
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2017-02-03 15:16:46 -0500
committerDavid S. Miller <davem@davemloft.net>2017-02-03 15:16:46 -0500
commit5a0fd98b7b5be8773c53c40c47451ec6cd11d1ff (patch)
tree56e1c64262e3ef4876e8d480555508d6a45358e7 /include/net
parent3541f9e8bdebce02458882b66b638d7302c1f616 (diff)
parent295a6e06d21e1f469c9f38b00125a13b60ad4e7c (diff)
Merge branch 'ife-to-module'
Yotam Gigi says: ==================== Extract IFE logic to module Extract ife logic from the tc_ife action into an independent module, and make the tc_ife action use it. This way, the ife encapsulation can be used by other modules other than tc_ife action. v1->v2: Fix duplicate symbol error by introducing a new patch that makes the original symbol static. The symbol ife_tlv_meta_extract is exported in act_ife, though not being used by any other module. As the symbol is being moved to the new ife module, introducing the new module creates duplicate symbol. To fix it, add a new patch (1/3) that makes the ife_tlv_meta_extract symbol static in act_ife, thus the symbol does not collide. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net')
-rw-r--r--include/net/ife.h51
-rw-r--r--include/net/tc_act/tc_ife.h3
2 files changed, 51 insertions, 3 deletions
diff --git a/include/net/ife.h b/include/net/ife.h
new file mode 100644