diff options
| author | Hong zhi guo | 2013-03-28 07:21:22 +0100 |
|---|---|---|
| committer | David S. Miller | 2013-03-28 19:41:19 +0100 |
| commit | c60ee67f45b3aa5dfbfe39bfe0b9e65459dc5ec7 (patch) | |
| tree | 24e28270f9ba9ad14a4b6c06662c7b524227ce47 /net/bridge/br_netlink.c | |
| parent | net/macb: make clk_enable atomic (diff) | |
| download | kernel-qcow2-linux-c60ee67f45b3aa5dfbfe39bfe0b9e65459dc5ec7.tar.gz kernel-qcow2-linux-c60ee67f45b3aa5dfbfe39bfe0b9e65459dc5ec7.tar.xz kernel-qcow2-linux-c60ee67f45b3aa5dfbfe39bfe0b9e65459dc5ec7.zip | |
bridge: remove unused variable ifm
Signed-off-by: Hong Zhiguo <honkiko@gmail.com>
Acked-by: Stephen Hemminger <stephen@networkplumber.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bridge/br_netlink.c')
| -rw-r--r-- | net/bridge/br_netlink.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/net/bridge/br_netlink.c b/net/bridge/br_netlink.c index b96e02e31bad..8e3abf564798 100644 --- a/net/bridge/br_netlink.c +++ b/net/bridge/br_netlink.c @@ -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; |