Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

[linux-drm-fsl-dcu.git] / net / bridge / br_netlink.c

diff --git a/net/bridge/br_netlink.c b/net/bridge/br_netlink.c
index f75d92e4f96b33cec6fd46fc37151224f86ed018..c2fd6bc5f08013325b25424e03bf684a56717897 100644 (file)
--- a/net/bridge/br_netlink.c
+++ b/net/bridge/br_netlink.c
@@ -373,7 +373,7 @@ int br_setlink(struct net_device *dev, struct nlmsghdr *nlh)
 
        p = br_port_get_rtnl(dev);
        /* We want to accept dev as bridge itself if the AF_SPEC
-        * is set to see if someone is setting vlan info on the brigde
+        * is set to see if someone is setting vlan info on the bridge
         */
        if (!p && !afspec)
                return -EINVAL;
@@ -389,7 +389,7 @@ int br_setlink(struct net_device *dev, struct nlmsghdr *nlh)
                        err = br_setport(p, tb);
                        spin_unlock_bh(&p->br->lock);
                } else {
-                       /* Binary compatability with old RSTP */
+                       /* Binary compatibility with old RSTP */
                        if (nla_len(protinfo) < sizeof(u8))
                                return -EINVAL;