diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-04 00:05:43 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-04 00:05:43 -0400 |
commit | 6dbbd92522a13bcd5003829cbed30bc38a3d0362 (patch) | |
tree | b486642d7392b81d89f159d65fd556a432e78d16 /net/ipv4/udplite.c | |
parent | d6748066ad0e8b2514545998f8367ebb3906f299 (diff) | |
parent | e1cfb67acd5e890bbad695000d2c997bfb7f1756 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (45 commits)
be2net: Add detect UE feature for Lancer
be2net: Prevent CQ full condition for Lancer
be2net: Fix disabling multicast promiscous mode
be2net: Fix endian issue in RX filter command
af_packet: de-inline some helper functions
MAINTAINERS: Add can-gw include to maintained files
net: Add back alignment for size for __alloc_skb
net: add missing bh_unlock_sock() calls
l2tp: fix race in l2tp_recv_dequeue()
ixgbevf: Update release version
ixgbe: DCB, return max for IEEE traffic classes
ixgbe: fix reading of the buffer returned by the firmware
ixgbe: Fix compiler warnings
ixgbe: fix smatch splat due to missing NULL check
ixgbe: fix disabling of Tx laser at probe
ixgbe: Fix link issues caused by a reset while interface is down
igb: Fix for I347AT4 PHY cable length unit detection
e100: make sure vlan support isn't advertised on old adapters
e1000e: demote a debugging WARN to a debug log message
net: fix typo in drivers/net/ethernet/xilinx/ll_temac_main.c
...
Diffstat (limited to 'net/ipv4/udplite.c')
-rw-r--r-- | net/ipv4/udplite.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/net/ipv4/udplite.c b/net/ipv4/udplite.c index aee9963f7f5a..08383eb54208 100644 --- a/net/ipv4/udplite.c +++ b/net/ipv4/udplite.c | |||
@@ -71,13 +71,20 @@ static struct inet_protosw udplite4_protosw = { | |||
71 | }; | 71 | }; |
72 | 72 | ||
73 | #ifdef CONFIG_PROC_FS | 73 | #ifdef CONFIG_PROC_FS |
74 | |||
75 | static const struct file_operations udplite_afinfo_seq_fops = { | ||
76 | .owner = THIS_MODULE, | ||
77 | .open = udp_seq_open, | ||
78 | .read = seq_read, | ||
79 | .llseek = seq_lseek, | ||
80 | .release = seq_release_net | ||
81 | }; | ||
82 | |||
74 | static struct udp_seq_afinfo udplite4_seq_afinfo = { | 83 | static struct udp_seq_afinfo udplite4_seq_afinfo = { |
75 | .name = "udplite", | 84 | .name = "udplite", |
76 | .family = AF_INET, | 85 | .family = AF_INET, |
77 | .udp_table = &udplite_table, | 86 | .udp_table = &udplite_table, |
78 | .seq_fops = { | 87 | .seq_fops = &udplite_afinfo_seq_fops, |
79 | .owner = THIS_MODULE, | ||
80 | }, | ||
81 | .seq_ops = { | 88 | .seq_ops = { |
82 | .show = udp4_seq_show, | 89 | .show = udp4_seq_show, |
83 | }, | 90 | }, |