git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
net
/
rose
/
rose_in.c
diff --git
a/net/rose/rose_in.c
b/net/rose/rose_in.c
index
c6aa8fb
..
8348d33
100644
(file)
--- a/
net/rose/rose_in.c
+++ b/
net/rose/rose_in.c
@@
-26,8
+26,7
@@
#include <linux/netdevice.h>
#include <linux/skbuff.h>
#include <net/sock.h>
#include <linux/netdevice.h>
#include <linux/skbuff.h>
#include <net/sock.h>
-#include <net/ip.h> /* For ip_rcv */
-#include <net/tcp.h>
+#include <net/tcp_states.h>
#include <asm/system.h>
#include <linux/fcntl.h>
#include <linux/mm.h>
#include <asm/system.h>
#include <linux/fcntl.h>
#include <linux/mm.h>
@@
-41,7
+40,7
@@
*/
static int rose_state1_machine(struct sock *sk, struct sk_buff *skb, int frametype)
{
*/
static int rose_state1_machine(struct sock *sk, struct sk_buff *skb, int frametype)
{
-
rose_cb
*rose = rose_sk(sk);
+
struct rose_sock
*rose = rose_sk(sk);
switch (frametype) {
case ROSE_CALL_ACCEPTED:
switch (frametype) {
case ROSE_CALL_ACCEPTED:
@@
-78,7
+77,7
@@
static int rose_state1_machine(struct sock *sk, struct sk_buff *skb, int framety
*/
static int rose_state2_machine(struct sock *sk, struct sk_buff *skb, int frametype)
{
*/
static int rose_state2_machine(struct sock *sk, struct sk_buff *skb, int frametype)
{
-
rose_cb
*rose = rose_sk(sk);
+
struct rose_sock
*rose = rose_sk(sk);
switch (frametype) {
case ROSE_CLEAR_REQUEST:
switch (frametype) {
case ROSE_CLEAR_REQUEST:
@@
-106,7
+105,7
@@
static int rose_state2_machine(struct sock *sk, struct sk_buff *skb, int framety
*/
static int rose_state3_machine(struct sock *sk, struct sk_buff *skb, int frametype, int ns, int nr, int q, int d, int m)
{
*/
static int rose_state3_machine(struct sock *sk, struct sk_buff *skb, int frametype, int ns, int nr, int q, int d, int m)
{
-
rose_cb
*rose = rose_sk(sk);
+
struct rose_sock
*rose = rose_sk(sk);
int queued = 0;
switch (frametype) {
int queued = 0;
switch (frametype) {
@@
-216,7
+215,7
@@
static int rose_state3_machine(struct sock *sk, struct sk_buff *skb, int framety
*/
static int rose_state4_machine(struct sock *sk, struct sk_buff *skb, int frametype)
{
*/
static int rose_state4_machine(struct sock *sk, struct sk_buff *skb, int frametype)
{
-
rose_cb
*rose = rose_sk(sk);
+
struct rose_sock
*rose = rose_sk(sk);
switch (frametype) {
case ROSE_RESET_REQUEST:
switch (frametype) {
case ROSE_RESET_REQUEST:
@@
-265,7
+264,7
@@
static int rose_state5_machine(struct sock *sk, struct sk_buff *skb, int framety
/* Higher level upcall for a LAPB frame */
int rose_process_rx_frame(struct sock *sk, struct sk_buff *skb)
{
/* Higher level upcall for a LAPB frame */
int rose_process_rx_frame(struct sock *sk, struct sk_buff *skb)
{
-
rose_cb
*rose = rose_sk(sk);
+
struct rose_sock
*rose = rose_sk(sk);
int queued = 0, frametype, ns, nr, q, d, m;
if (rose->state == ROSE_STATE_0)
int queued = 0, frametype, ns, nr, q, d, m;
if (rose->state == ROSE_STATE_0)