summaryrefslogtreecommitdiffstats
path: root/python-ethtool/etherinfo_struct.h
diff options
context:
space:
mode:
authorDavid Sommerseth <davids@redhat.com>2013-09-12 17:01:59 +0200
committerDavid Sommerseth <davids@redhat.com>2013-09-12 17:01:59 +0200
commitd9922c0cf642da50794c3d23b61dcdd49684af8e (patch)
treef569204632cb7f7fd5b32198f1842438372e1542 /python-ethtool/etherinfo_struct.h
parentc61363e517154548f0b85772e1f83186dff898bc (diff)
downloadpython-ethtool-d9922c0cf642da50794c3d23b61dcdd49684af8e.tar.gz
python-ethtool-d9922c0cf642da50794c3d23b61dcdd49684af8e.tar.xz
python-ethtool-d9922c0cf642da50794c3d23b61dcdd49684af8e.zip
Migrated from libnl-1 to libnl-3
This ports the current functionality from libnl-1 to libnl-3.0. At the current stage, it should be functional but more patches cleaning up the code will come. Signed-off-by: David Sommerseth <davids@redhat.com>
Diffstat (limited to 'python-ethtool/etherinfo_struct.h')
-rw-r--r--python-ethtool/etherinfo_struct.h9
1 files changed, 3 insertions, 6 deletions
diff --git a/python-ethtool/etherinfo_struct.h b/python-ethtool/etherinfo_struct.h
index bcb692d..f9c1306 100644
--- a/python-ethtool/etherinfo_struct.h
+++ b/python-ethtool/etherinfo_struct.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2009-2011 Red Hat Inc.
+ * Copyright (C) 2009-2013 Red Hat Inc.
*
* David Sommerseth <davids@redhat.com>
*
@@ -13,7 +13,6 @@
* General Public License for more details.
*/
-#include <netlink/route/addr.h>
/**
* @file etherinfo_struct.h
@@ -66,7 +65,7 @@ struct ipv6address {
*
*/
struct etherinfo_obj_data {
- struct nl_handle **nlc; /**< Contains NETLINK connection info (global) */
+ struct nl_sock **nlc; /**< Contains NETLINK connection info (global) */
unsigned int *nlc_users; /**< Resource counter for the NETLINK connection (global) */
unsigned short nlc_active; /**< Is this instance using NETLINK? */
struct etherinfo *ethinfo; /**< Contains info about our current interface */
@@ -99,9 +98,7 @@ typedef struct {
*/
#define RETURN_STRING(str) (str ? PyString_FromString(str) : (Py_INCREF(Py_None), Py_None))
-PyObject *
-make_python_address_from_rtnl_addr(struct nl_object *obj,
- struct rtnl_addr *addr);
+PyObject * make_python_address_from_rtnl_addr(struct rtnl_addr *addr);
#endif