diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-19 13:23:21 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-19 13:23:21 -0400 |
| commit | ce8c2293be47999584908069e78bf6d94beadc53 (patch) | |
| tree | dfd6909e6866998d2103341b1e1af8c129d0cea8 /net/tipc | |
| parent | 41e9d344bf52c57ec16648d08618b61d3f1d4bdc (diff) | |
| parent | ee6a99b539a50b4e9398938a0a6d37f8bf911550 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (25 commits)
[TG3]: Fix msi issue with kexec/kdump.
[NET] XFRM: Fix whitespace errors.
[NET] TIPC: Fix whitespace errors.
[NET] SUNRPC: Fix whitespace errors.
[NET] SCTP: Fix whitespace errors.
[NET] RXRPC: Fix whitespace errors.
[NET] ROSE: Fix whitespace errors.
[NET] RFKILL: Fix whitespace errors.
[NET] PACKET: Fix whitespace errors.
[NET] NETROM: Fix whitespace errors.
[NET] NETFILTER: Fix whitespace errors.
[NET] IPV4: Fix whitespace errors.
[NET] DCCP: Fix whitespace errors.
[NET] CORE: Fix whitespace errors.
[NET] BLUETOOTH: Fix whitespace errors.
[NET] AX25: Fix whitespace errors.
[PATCH] mac80211: remove rtnl locking in ieee80211_sta.c
[PATCH] mac80211: fix GCC warning on 64bit platforms
[GENETLINK]: Dynamic multicast groups.
[NETLIKN]: Allow removing multicast groups.
...
Diffstat (limited to 'net/tipc')
| -rw-r--r-- | net/tipc/socket.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/net/tipc/socket.c b/net/tipc/socket.c index 4a8f37f48764..84110172031e 100644 --- a/net/tipc/socket.c +++ b/net/tipc/socket.c | |||
| @@ -1629,8 +1629,8 @@ static struct proto_ops msg_ops = { | |||
| 1629 | .getsockopt = getsockopt, | 1629 | .getsockopt = getsockopt, |
| 1630 | .sendmsg = send_msg, | 1630 | .sendmsg = send_msg, |
| 1631 | .recvmsg = recv_msg, | 1631 | .recvmsg = recv_msg, |
| 1632 | .mmap = sock_no_mmap, | 1632 | .mmap = sock_no_mmap, |
| 1633 | .sendpage = sock_no_sendpage | 1633 | .sendpage = sock_no_sendpage |
| 1634 | }; | 1634 | }; |
| 1635 | 1635 | ||
| 1636 | static struct proto_ops packet_ops = { | 1636 | static struct proto_ops packet_ops = { |
| @@ -1650,8 +1650,8 @@ static struct proto_ops packet_ops = { | |||
| 1650 | .getsockopt = getsockopt, | 1650 | .getsockopt = getsockopt, |
| 1651 | .sendmsg = send_packet, | 1651 | .sendmsg = send_packet, |
| 1652 | .recvmsg = recv_msg, | 1652 | .recvmsg = recv_msg, |
| 1653 | .mmap = sock_no_mmap, | 1653 | .mmap = sock_no_mmap, |
| 1654 | .sendpage = sock_no_sendpage | 1654 | .sendpage = sock_no_sendpage |
| 1655 | }; | 1655 | }; |
| 1656 | 1656 | ||
| 1657 | static struct proto_ops stream_ops = { | 1657 | static struct proto_ops stream_ops = { |
| @@ -1671,8 +1671,8 @@ static struct proto_ops stream_ops = { | |||
| 1671 | .getsockopt = getsockopt, | 1671 | .getsockopt = getsockopt, |
| 1672 | .sendmsg = send_stream, | 1672 | .sendmsg = send_stream, |
| 1673 | .recvmsg = recv_stream, | 1673 | .recvmsg = recv_stream, |
| 1674 | .mmap = sock_no_mmap, | 1674 | .mmap = sock_no_mmap, |
| 1675 | .sendpage = sock_no_sendpage | 1675 | .sendpage = sock_no_sendpage |
| 1676 | }; | 1676 | }; |
| 1677 | 1677 | ||
| 1678 | static struct net_proto_family tipc_family_ops = { | 1678 | static struct net_proto_family tipc_family_ops = { |