diff options
| author | David Sommerseth <davids@redhat.com> | 2010-08-03 10:30:23 +0200 |
|---|---|---|
| committer | David Sommerseth <davids@redhat.com> | 2010-08-03 10:30:23 +0200 |
| commit | b80e65903258d71ac7be0f0775db15aa096a4b54 (patch) | |
| tree | b21b10b5a86f96b98312b7d8daf3ab3dd5c0cce2 /python-ethtool/etherinfo.c | |
| parent | 19be403f729d3064259ca17e57ef24a1cc2ff81b (diff) | |
| download | python-ethtool-b80e65903258d71ac7be0f0775db15aa096a4b54.tar.gz python-ethtool-b80e65903258d71ac7be0f0775db15aa096a4b54.tar.xz python-ethtool-b80e65903258d71ac7be0f0775db15aa096a4b54.zip | |
Get rid of not needed struct wrapping
The struct nl_handle was wrapped inside struct _nlconnection. This
is really not needed if open_netlink() and close_netlink() functions
uses "pointer's pointer" (struct nl_handle **) instead. Removes also
the need to declare a static struct _nlconnection, as the
global nlconnection variable can now be a pointer as well.
Signed-off-by: David Sommerseth <davids@redhat.com>
Diffstat (limited to 'python-ethtool/etherinfo.c')
| -rw-r--r-- | python-ethtool/etherinfo.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/python-ethtool/etherinfo.c b/python-ethtool/etherinfo.c index 4cb5bc1..2091a3c 100644 --- a/python-ethtool/etherinfo.c +++ b/python-ethtool/etherinfo.c @@ -274,7 +274,7 @@ void dump_etherinfo(FILE *fp, struct etherinfo *ptr) * * @return Returns 1 on success, otherwise 0. */ -int get_etherinfo(struct etherinfo *ethinf, struct _nlconnection *nlc, nlQuery query) +int get_etherinfo(struct etherinfo *ethinf, struct nl_handle *nlc, nlQuery query) { struct nl_cache *link_cache; struct nl_cache *addr_cache; @@ -291,7 +291,7 @@ int get_etherinfo(struct etherinfo *ethinf, struct _nlconnection *nlc, nlQuery q * interface index if we have that */ if( ethinf->index < 0 ) { - link_cache = rtnl_link_alloc_cache(nlc->nlrt_handle); + link_cache = rtnl_link_alloc_cache(nlc); ethinf->index = rtnl_link_name2i(link_cache, ethinf->device); if( ethinf->index < 0 ) { return 0; @@ -303,7 +303,7 @@ int get_etherinfo(struct etherinfo *ethinf, struct _nlconnection *nlc, nlQuery q switch( query ) { case NLQRY_LINK: /* Extract MAC/hardware address of the interface */ - link_cache = rtnl_link_alloc_cache(nlc->nlrt_handle); + link_cache = rtnl_link_alloc_cache(nlc); link = rtnl_link_alloc(); rtnl_link_set_ifindex(link, ethinf->index); nl_cache_foreach_filter(link_cache, (struct nl_object *)link, callback_nl_link, ethinf); @@ -318,7 +318,7 @@ int get_etherinfo(struct etherinfo *ethinf, struct _nlconnection *nlc, nlQuery q ethinf->ipv6_addresses = NULL; /* Extract IP address information */ - addr_cache = rtnl_addr_alloc_cache(nlc->nlrt_handle); + addr_cache = rtnl_addr_alloc_cache(nlc); addr = rtnl_addr_alloc(); rtnl_addr_set_ifindex(addr, ethinf->index); nl_cache_foreach_filter(addr_cache, (struct nl_object *)addr, callback_nl_address, ethinf); |