From: Adrian Bunk <bunk@stusta.de>
To: netdev@oss.sgi.com
Cc: linux-kernel@vger.kernel.org
Subject: [2.6 patch] net/packet/af_packet.c: make some code static
Date: Wed, 15 Dec 2004 01:47:45 +0100 [thread overview]
Message-ID: <20041215004745.GI23151@stusta.de> (raw)
The patch below makes some needlessly global code static.
diffstat output:
net/packet/af_packet.c | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 deletions(-)
Signed-off-by: Adrian Bunk <bunk@stusta.de>
--- linux-2.6.10-rc3-mm1-full/net/packet/af_packet.c.old 2004-12-14 21:47:49.000000000 +0100
+++ linux-2.6.10-rc3-mm1-full/net/packet/af_packet.c 2004-12-14 21:50:25.000000000 +0100
@@ -145,10 +145,10 @@
*/
/* List of all packet sockets. */
-HLIST_HEAD(packet_sklist);
+static HLIST_HEAD(packet_sklist);
static rwlock_t packet_sklist_lock = RW_LOCK_UNLOCKED;
-atomic_t packet_socks_nr;
+static atomic_t packet_socks_nr;
/* Private packet socket structures. */
@@ -215,7 +215,7 @@
#define pkt_sk(__sk) ((struct packet_opt *)(__sk)->sk_protinfo)
-void packet_sock_destruct(struct sock *sk)
+static void packet_sock_destruct(struct sock *sk)
{
BUG_TRAP(!atomic_read(&sk->sk_rmem_alloc));
BUG_TRAP(!atomic_read(&sk->sk_wmem_alloc));
@@ -234,10 +234,10 @@
}
-extern struct proto_ops packet_ops;
+static struct proto_ops packet_ops;
#ifdef CONFIG_SOCK_PACKET
-extern struct proto_ops packet_ops_spkt;
+static struct proto_ops packet_ops_spkt;
static int packet_rcv_spkt(struct sk_buff *skb, struct net_device *dev, struct packet_type *pt)
{
@@ -1350,8 +1350,8 @@
}
}
-int packet_getsockopt(struct socket *sock, int level, int optname,
- char __user *optval, int __user *optlen)
+static int packet_getsockopt(struct socket *sock, int level, int optname,
+ char __user *optval, int __user *optlen)
{
int len;
struct sock *sk = sock->sk;
@@ -1500,7 +1500,8 @@
#define packet_poll datagram_poll
#else
-unsigned int packet_poll(struct file * file, struct socket *sock, poll_table *wait)
+static unsigned int packet_poll(struct file * file, struct socket *sock,
+ poll_table *wait)
{
struct sock *sk = sock->sk;
struct packet_opt *po = pkt_sk(sk);
@@ -1747,7 +1748,7 @@
#ifdef CONFIG_SOCK_PACKET
-struct proto_ops packet_ops_spkt = {
+static struct proto_ops packet_ops_spkt = {
.family = PF_PACKET,
.owner = THIS_MODULE,
.release = packet_release,
@@ -1769,7 +1770,7 @@
};
#endif
-struct proto_ops packet_ops = {
+static struct proto_ops packet_ops = {
.family = PF_PACKET,
.owner = THIS_MODULE,
.release = packet_release,
next reply other threads:[~2004-12-15 0:47 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2004-12-15 0:47 Adrian Bunk [this message]
2004-12-28 3:09 ` [2.6 patch] net/packet/af_packet.c: make some code static David S. Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20041215004745.GI23151@stusta.de \
--to=bunk@stusta.de \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@oss.sgi.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).