diff options
| author | David S. Miller <davem@davemloft.net> | 2017-02-03 15:16:46 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-02-03 15:16:46 -0500 |
| commit | 5a0fd98b7b5be8773c53c40c47451ec6cd11d1ff (patch) | |
| tree | 56e1c64262e3ef4876e8d480555508d6a45358e7 | |
| parent | 3541f9e8bdebce02458882b66b638d7302c1f616 (diff) | |
| parent | 295a6e06d21e1f469c9f38b00125a13b60ad4e7c (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>
| -rw-r--r-- | MAINTAINERS | 7 | ||||
| -rw-r--r-- | include/net/ife.h | 51 | ||||
| -rw-r--r-- | include/net/tc_act/tc_ife.h | 3 | ||||
| -rw-r--r-- | include/uapi/linux/Kbuild | 1 | ||||
| -rw-r--r-- | include/uapi/linux/ife.h | 18 | ||||
| -rw-r--r-- | include/uapi/linux/tc_act/tc_ife.h | 10 | ||||
| -rw-r--r-- | net/Kconfig | 1 | ||||
| -rw-r--r-- | net/Makefile | 1 | ||||
| -rw-r--r-- | net/ife/Kconfig | 16 | ||||
| -rw-r--r-- | net/ife/Makefile | 5 | ||||
| -rw-r--r-- | net/ife/ife.c | 142 | ||||
| -rw-r--r-- | net/sched/Kconfig | 1 | ||||
| -rw-r--r-- | net/sched/act_ife.c | 110 |
13 files changed, 276 insertions, 90 deletions
diff --git a/MAINTAINERS b/MAINTAINERS |