Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 327422
b: refs/heads/master
c: 24cb81a
h: refs/heads/master
v: v3
  • Loading branch information
Eric W. Biederman authored and David S. Miller committed Aug 15, 2012
1 parent 513e7f2 commit 20e82c0
Show file tree
Hide file tree
Showing 4 changed files with 342 additions and 284 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: e7ff4a7037e6908b7a5f4682945a0b097d5b3535
refs/heads/master: 24cb81a6a91288fcba19548944729ea906eb5e2a
3 changes: 2 additions & 1 deletion trunk/include/net/sctp/sm.h
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,8 @@ typedef struct {
int action;
} sctp_sm_command_t;

typedef sctp_disposition_t (sctp_state_fn_t) (const struct sctp_endpoint *,
typedef sctp_disposition_t (sctp_state_fn_t) (struct net *,
const struct sctp_endpoint *,
const struct sctp_association *,
const sctp_subtype_t type,
void *arg,
Expand Down
2 changes: 1 addition & 1 deletion trunk/net/sctp/sm_sideeffect.c
Original file line number Diff line number Diff line change
Expand Up @@ -1123,7 +1123,7 @@ int sctp_do_sm(struct net *net, sctp_event_t event_type, sctp_subtype_t subtype,
sctp_init_cmd_seq(&commands);

DEBUG_PRE;
status = (*state_fn->fn)(ep, asoc, subtype, event_arg, &commands);
status = (*state_fn->fn)(net, ep, asoc, subtype, event_arg, &commands);
DEBUG_POST;

error = sctp_side_effects(event_type, subtype, state,
Expand Down
Loading

0 comments on commit 20e82c0

Please sign in to comment.