summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorJochen Friedrich <jochen@scram.de>2005-09-22 04:44:55 -0300
committerArnaldo Carvalho de Melo <acme@mandriva.com>2005-09-22 04:44:55 -0300
commitcf309e3fb863b7a245b91f816193957f6daf786f (patch)
treedea98fdd919c726857d63b9a0f60e9ba89ca32d8 /net
parent6e2144b76840be09924de1626e2dcd7b315f75b3 (diff)
[LLC]: Fix for Bugzilla ticket #5156
Signed-off-by: Jochen Friedrich <jochen@scram.de> Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com>
Diffstat (limited to 'net')
-rw-r--r--net/core/dev.c2
-rw-r--r--net/llc/af_llc.c6
2 files changed, 8 insertions, 0 deletions
diff --git a/net/core/dev.c b/net/core/dev.c
index c01511e3d0c1..37c881070963 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -574,6 +574,8 @@ struct net_device *dev_getbyhwaddr(unsigned short type, char *ha)
return dev;
}
+EXPORT_SYMBOL(dev_getbyhwaddr);
+
struct net_device *dev_getfirstbyhwtype(unsigned short type)
{
struct net_device *dev;
diff --git a/net/llc/af_llc.c b/net/llc/af_llc.c
index a75b8f2aab19..0607cd3fd12c 100644
--- a/net/llc/af_llc.c
+++ b/net/llc/af_llc.c
@@ -296,6 +296,12 @@ static int llc_ui_bind(struct socket *sock, struct sockaddr *uaddr, int addrlen)
rc = -EAFNOSUPPORT;
if (unlikely(addr->sllc_family != AF_LLC))
goto out;
+ rc = -ENODEV;
+ rtnl_lock();
+ llc->dev = dev_getbyhwaddr(addr->sllc_arphrd, addr->sllc_mac);
+ rtnl_unlock();
+ if (!llc->dev)
+ goto out;
if (!addr->sllc_sap) {
rc = -EUSERS;
addr->sllc_sap = llc_ui_autoport();