diff options
| author | David S. Miller <davem@davemloft.net> | 2014-11-11 13:32:25 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-11-11 13:32:25 -0500 |
| commit | 4083c8056deebc01e658d6a2ba060cca4e733fb8 (patch) | |
| tree | 031b87d6800ba69eab4f00c304472864e50c51d2 /net/openvswitch/vport-netdev.c | |
| parent | a2ae6007a442d6bb27d77bf20ec1b06cda9e306e (diff) | |
| parent | 05da5898a96c05e32aa9850c9cd89eef29471b13 (diff) | |
| download | linux-4083c8056deebc01e658d6a2ba060cca4e733fb8.tar.gz linux-4083c8056deebc01e658d6a2ba060cca4e733fb8.tar.bz2 linux-4083c8056deebc01e658d6a2ba060cca4e733fb8.zip | |
Merge branch 'net_next_ovs' of git://git.kernel.org/pub/scm/linux/kernel/git/pshelar/openvswitch
Pravin B Shelar says:
====================
Open vSwitch
Following batch of patches brings feature parity between upstream
ovs and out of tree ovs module.
Two features are added, first adds support to export egress
tunnel information for a packet. This is used to improve
visibility in network traffic. Second feature allows userspace
vswitchd process to probe ovs module features. Other patches
are optimization and code cleanup.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/openvswitch/vport-netdev.c')
| -rw-r--r-- | net/openvswitch/vport-netdev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/openvswitch/vport-netdev.c b/net/openvswitch/vport-netdev.c index 877ee74b4f08..4776282c6417 100644 --- a/net/openvswitch/vport-netdev.c +++ b/net/openvswitch/vport-netdev.c @@ -77,7 +77,7 @@ static rx_handler_result_t netdev_frame_hook(struct sk_buff **pskb) return RX_HANDLER_CONSUMED; } -static struct net_device *get_dpdev(struct datapath *dp) +static struct net_device *get_dpdev(const struct datapath *dp) { struct vport *local; |