commit a832b9b37dbe1e0c8f8122502b0e9e80ee20e61b
author davem <davem> Fri Feb 01 22:05:43 2002 +0000
committer davem <davem> Fri Feb 01 22:05:43 2002 +0000
tree 5d28a49b0317f9919210b21ceda0e17822ab464c
parent b902bcf5cccfc4a87f32f4c99a4a9e4563e204d6

Revert bug-fix-undoings from acme patches.

net/802/cl2llc.c

diff --git a/net/802/cl2llc.c b/net/802/cl2llc.c
index c1b2ca8..a1e3248 100644
--- a/net/802/cl2llc.c
+++ b/net/802/cl2llc.c
@@ -96,7 +96,7 @@
 				else
 					llc_interpret_pseudo_code(lp, REJECT1, skb, NO_FRAME);
 				break;
-			default:
+			default:;
 		}
 		if(lp->llc_callbacks)
 		{
@@ -497,7 +497,7 @@
 				else
 					lp->f_flag = fr->i_hdr.i_pflag;
 				break;
-			default:
+			default:;
 		}
 		pc++;	
 	}

net/socket.c

diff --git a/net/socket.c b/net/socket.c
index d5a92b5..0be746b 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -131,7 +131,7 @@
  *	The protocol list. Each protocol is registered in here.
  */
 
-struct net_proto_family *net_families[NPROTO];
+static struct net_proto_family *net_families[NPROTO];
 
 #ifdef CONFIG_SMP
 static atomic_t net_family_lockct = ATOMIC_INIT(0);