diff options
| author | David S. Miller <davem@davemloft.net> | 2013-06-14 15:31:22 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-06-14 15:31:22 -0700 |
| commit | 09ce069dff607f86dcdeb541d20734a8f42478c5 (patch) | |
| tree | 03c7e9dc78d4dbfc2b3687053bbbd1680789934d /net/openvswitch/vport-netdev.h | |
| parent | 948e306d7d645af80ea331b60495710fe4fe12bb (diff) | |
| parent | 93d8fd1514b6862c3370ea92be3f3b4216e0bf8f (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jesse/openvswitch
Jesse Gross says:
====================
A few miscellaneous improvements and cleanups before the GRE tunnel
integration series. Intended for net-next/3.11.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/openvswitch/vport-netdev.h')
| -rw-r--r-- | net/openvswitch/vport-netdev.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/openvswitch/vport-netdev.h b/net/openvswitch/vport-netdev.h index a3cb3a32cd77..dd298b5c5cdb 100644 --- a/net/openvswitch/vport-netdev.h +++ b/net/openvswitch/vport-netdev.h @@ -39,6 +39,5 @@ netdev_vport_priv(const struct vport *vport) } const char *ovs_netdev_get_name(const struct vport *); -const char *ovs_netdev_get_config(const struct vport *); #endif /* vport_netdev.h */ |