Commit 606456cc authored by David S. Miller's avatar David S. Miller

Merge master.kernel.org:/home/acme/BK/llc-2.5

into nuts.ninka.net:/home/davem/src/BK/net-2.5
parents bf616807 87c9fe7c
...@@ -1113,7 +1113,7 @@ static struct net_proto_family llc_ui_family_ops = { ...@@ -1113,7 +1113,7 @@ static struct net_proto_family llc_ui_family_ops = {
.create = llc_ui_create, .create = llc_ui_create,
}; };
static struct proto_ops SOCKOPS_WRAPPED(llc_ui_ops) = { static struct proto_ops llc_ui_ops = {
.family = PF_LLC, .family = PF_LLC,
.release = llc_ui_release, .release = llc_ui_release,
.bind = llc_ui_bind, .bind = llc_ui_bind,
...@@ -1133,9 +1133,6 @@ static struct proto_ops SOCKOPS_WRAPPED(llc_ui_ops) = { ...@@ -1133,9 +1133,6 @@ static struct proto_ops SOCKOPS_WRAPPED(llc_ui_ops) = {
.sendpage = sock_no_sendpage, .sendpage = sock_no_sendpage,
}; };
#include <linux/smp_lock.h>
SOCKOPS_WRAP(llc_ui, PF_LLC);
static char llc_ui_banner[] __initdata = static char llc_ui_banner[] __initdata =
KERN_INFO "NET4.0 IEEE 802.2 BSD sockets, Jay Schulist, 2001, Arnaldo C. Melo, 2002\n"; KERN_INFO "NET4.0 IEEE 802.2 BSD sockets, Jay Schulist, 2001, Arnaldo C. Melo, 2002\n";
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment