X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=src%2Fshared%2Fnet-condition.h;h=0884d43f4604f5c98b9e397c64a81df94f94eb54;hb=HEAD;hp=4f8e30a27164bb2649435a1196bfaf6c77348a36;hpb=78fac35811c2677849a9f75e5f262bc03703d7c3;p=thirdparty%2Fsystemd.git diff --git a/src/shared/net-condition.h b/src/shared/net-condition.h index 4f8e30a2716..0884d43f460 100644 --- a/src/shared/net-condition.h +++ b/src/shared/net-condition.h @@ -11,11 +11,12 @@ #include "set.h" typedef struct NetMatch { - Set *mac; - Set *permanent_mac; + Set *hw_addr; + Set *permanent_hw_addr; char **path; char **driver; - char **iftype; + char **iftype; /* udev's DEVTYPE field or ARPHRD_XXX, e.g. ether, wlan. */ + char **kind; /* IFLA_INFO_KIND attribute, e.g. gre, gretap, erspan. */ char **ifname; char **property; char **wlan_iftype; @@ -29,10 +30,11 @@ bool net_match_is_empty(const NetMatch *match); int net_match_config( const NetMatch *match, sd_device *device, - const struct ether_addr *mac, - const struct ether_addr *permanent_mac, + const struct hw_addr_data *hw_addr, + const struct hw_addr_data *permanent_hw_addr, const char *driver, unsigned short iftype, + const char *kind, const char *ifname, char * const *alternative_names, enum nl80211_iftype wlan_iftype,