aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordavem <davem>2002-02-01 22:05:43 +0000
committerdavem <davem>2002-02-01 22:05:43 +0000
commita832b9b37dbe1e0c8f8122502b0e9e80ee20e61b (patch)
tree5d28a49b0317f9919210b21ceda0e17822ab464c
parentb902bcf5cccfc4a87f32f4c99a4a9e4563e204d6 (diff)
downloadnetdev-vger-cvs-a832b9b37dbe1e0c8f8122502b0e9e80ee20e61b.tar.gz
Revert bug-fix-undoings from acme patches.
-rw-r--r--net/802/cl2llc.c4
-rw-r--r--net/socket.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/net/802/cl2llc.c b/net/802/cl2llc.c
index c1b2ca810..a1e32480e 100644
--- a/net/802/cl2llc.c
+++ b/net/802/cl2llc.c
@@ -96,7 +96,7 @@ int llc_data_request(llcptr lp, struct sk_buff *skb)
else
llc_interpret_pseudo_code(lp, REJECT1, skb, NO_FRAME);
break;
- default:
+ default:;
}
if(lp->llc_callbacks)
{
@@ -497,7 +497,7 @@ void llc_interpret_pseudo_code(llcptr lp, int pc_label, struct sk_buff *skb,
else
lp->f_flag = fr->i_hdr.i_pflag;
break;
- default:
+ default:;
}
pc++;
}
diff --git a/net/socket.c b/net/socket.c
index d5a92b558..0be746b10 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -131,7 +131,7 @@ static struct file_operations socket_file_ops = {
* 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);