|
@@ -352,17 +352,14 @@ static int br_setport(struct net_bridge_port *p, struct nlattr *tb[])
|
|
|
/* Change state and parameters on port. */
|
|
|
int br_setlink(struct net_device *dev, struct nlmsghdr *nlh)
|
|
|
{
|
|
|
- struct ifinfomsg *ifm;
|
|
|
struct nlattr *protinfo;
|
|
|
struct nlattr *afspec;
|
|
|
struct net_bridge_port *p;
|
|
|
struct nlattr *tb[IFLA_BRPORT_MAX + 1];
|
|
|
int err = 0;
|
|
|
|
|
|
- ifm = nlmsg_data(nlh);
|
|
|
-
|
|
|
- protinfo = nlmsg_find_attr(nlh, sizeof(*ifm), IFLA_PROTINFO);
|
|
|
- afspec = nlmsg_find_attr(nlh, sizeof(*ifm), IFLA_AF_SPEC);
|
|
|
+ protinfo = nlmsg_find_attr(nlh, sizeof(struct ifinfomsg), IFLA_PROTINFO);
|
|
|
+ afspec = nlmsg_find_attr(nlh, sizeof(struct ifinfomsg), IFLA_AF_SPEC);
|
|
|
if (!protinfo && !afspec)
|
|
|
return 0;
|
|
|
|
|
@@ -411,14 +408,11 @@ out:
|
|
|
/* Delete port information */
|
|
|
int br_dellink(struct net_device *dev, struct nlmsghdr *nlh)
|
|
|
{
|
|
|
- struct ifinfomsg *ifm;
|
|
|
struct nlattr *afspec;
|
|
|
struct net_bridge_port *p;
|
|
|
int err;
|
|
|
|
|
|
- ifm = nlmsg_data(nlh);
|
|
|
-
|
|
|
- afspec = nlmsg_find_attr(nlh, sizeof(*ifm), IFLA_AF_SPEC);
|
|
|
+ afspec = nlmsg_find_attr(nlh, sizeof(struct ifinfomsg), IFLA_AF_SPEC);
|
|
|
if (!afspec)
|
|
|
return 0;
|
|
|
|