diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-17 23:53:52 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-17 23:53:52 -0400 |
| commit | f205ce83a766c08965ec78342f138cdc00631fba (patch) | |
| tree | 7a9d2db6c16594ef7c730ca93a87131cf0abca41 /net/rds | |
| parent | 3dc95666df0e1ae5b7381a8ec97a583bb3ce4306 (diff) | |
| parent | b31c50a7f9e93a61d14740dedcbbf2c376998bc7 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (66 commits)
be2net: fix some cmds to use mccq instead of mbox
atl1e: fix 2.6.31-git4 -- ATL1E 0000:03:00.0: DMA-API: device driver frees DMA
pkt_sched: Fix qstats.qlen updating in dump_stats
ipv6: Log the affected address when DAD failure occurs
wl12xx: Fix print_mac() conversion.
af_iucv: fix race when queueing skbs on the backlog queue
af_iucv: do not call iucv_sock_kill() twice
af_iucv: handle non-accepted sockets after resuming from suspend
af_iucv: fix race in __iucv_sock_wait()
iucv: use correct output register in iucv_query_maxconn()
iucv: fix iucv_buffer_cpumask check when calling IUCV functions
iucv: suspend/resume error msg for left over pathes
wl12xx: switch to %pM to print the mac address
b44: the poll handler b44_poll must not enable IRQ unconditionally
ipv6: Ignore route option with ROUTER_PREF_INVALID
bonding: make ab_arp select active slaves as other modes
cfg80211: fix SME connect
rc80211_minstrel: fix contention window calculation
ssb/sdio: fix printk format warnings
p54usb: add Zcomax XG-705A usbid
...
Diffstat (limited to 'net/rds')
| -rw-r--r-- | net/rds/af_rds.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/rds/af_rds.c b/net/rds/af_rds.c index 108ed2e671c5..6b58aeff4c7a 100644 --- a/net/rds/af_rds.c +++ b/net/rds/af_rds.c | |||
| @@ -359,7 +359,7 @@ static struct proto rds_proto = { | |||
| 359 | .obj_size = sizeof(struct rds_sock), | 359 | .obj_size = sizeof(struct rds_sock), |
| 360 | }; | 360 | }; |
| 361 | 361 | ||
| 362 | static struct proto_ops rds_proto_ops = { | 362 | static const struct proto_ops rds_proto_ops = { |
| 363 | .family = AF_RDS, | 363 | .family = AF_RDS, |
| 364 | .owner = THIS_MODULE, | 364 | .owner = THIS_MODULE, |
| 365 | .release = rds_release, | 365 | .release = rds_release, |