---

yaml --- r: 9344 b: refs/heads/master c: cf309e3 h: refs/heads/master v: v3
git-mirror · Sep 22, 2005 · 35bd4ca · 35bd4ca
1 parent 80a0db4
commit 35bd4ca
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6e2144b76840be09924de1626e2dcd7b315f75b3
+refs/heads/master: cf309e3fb863b7a245b91f816193957f6daf786f
diff --git a/trunk/net/core/dev.c b/trunk/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/trunk/net/llc/af_llc.c b/trunk/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();