diff options
Diffstat (limited to 'net/llc')
-rw-r--r-- | net/llc/llc_c_ac.c | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/net/llc/llc_c_ac.c b/net/llc/llc_c_ac.c index 309c5682e58d..9abaecceea68 100644 --- a/net/llc/llc_c_ac.c +++ b/net/llc/llc_c_ac.c | |||
@@ -267,11 +267,10 @@ int llc_conn_ac_send_dm_rsp_f_set_1(struct sock *sk, struct sk_buff *skb) | |||
267 | 267 | ||
268 | if (nskb) { | 268 | if (nskb) { |
269 | struct llc_sap *sap = llc->sap; | 269 | struct llc_sap *sap = llc->sap; |
270 | u8 f_bit = 1; | ||
271 | 270 | ||
272 | llc_pdu_header_init(nskb, LLC_PDU_TYPE_U, sap->laddr.lsap, | 271 | llc_pdu_header_init(nskb, LLC_PDU_TYPE_U, sap->laddr.lsap, |
273 | llc->daddr.lsap, LLC_PDU_RSP); | 272 | llc->daddr.lsap, LLC_PDU_RSP); |
274 | llc_pdu_init_as_dm_rsp(nskb, f_bit); | 273 | llc_pdu_init_as_dm_rsp(nskb, 1); |
275 | rc = llc_mac_hdr_init(nskb, llc->dev->dev_addr, llc->daddr.mac); | 274 | rc = llc_mac_hdr_init(nskb, llc->dev->dev_addr, llc->daddr.mac); |
276 | if (rc) | 275 | if (rc) |
277 | goto free; | 276 | goto free; |
@@ -324,13 +323,12 @@ int llc_conn_ac_resend_frmr_rsp_f_set_0(struct sock *sk, struct sk_buff *skb) | |||
324 | struct sk_buff *nskb = llc_alloc_frame(llc->dev); | 323 | struct sk_buff *nskb = llc_alloc_frame(llc->dev); |
325 | 324 | ||
326 | if (nskb) { | 325 | if (nskb) { |
327 | u8 f_bit = 0; | ||
328 | struct llc_sap *sap = llc->sap; | 326 | struct llc_sap *sap = llc->sap; |
329 | struct llc_pdu_sn *pdu = (struct llc_pdu_sn *)&llc->rx_pdu_hdr; | 327 | struct llc_pdu_sn *pdu = (struct llc_pdu_sn *)&llc->rx_pdu_hdr; |
330 | 328 | ||
331 | llc_pdu_header_init(nskb, LLC_PDU_TYPE_U, sap->laddr.lsap, | 329 | llc_pdu_header_init(nskb, LLC_PDU_TYPE_U, sap->laddr.lsap, |
332 | llc->daddr.lsap, LLC_PDU_RSP); | 330 | llc->daddr.lsap, LLC_PDU_RSP); |
333 | llc_pdu_init_as_frmr_rsp(nskb, pdu, f_bit, llc->vS, | 331 | llc_pdu_init_as_frmr_rsp(nskb, pdu, 0, llc->vS, |
334 | llc->vR, INCORRECT); | 332 | llc->vR, INCORRECT); |
335 | rc = llc_mac_hdr_init(nskb, llc->dev->dev_addr, llc->daddr.mac); | 333 | rc = llc_mac_hdr_init(nskb, llc->dev->dev_addr, llc->daddr.mac); |
336 | if (rc) | 334 | if (rc) |
@@ -502,12 +500,11 @@ int llc_conn_ac_send_rej_rsp_f_set_1(struct sock *sk, struct sk_buff *skb) | |||
502 | struct sk_buff *nskb = llc_alloc_frame(llc->dev); | 500 | struct sk_buff *nskb = llc_alloc_frame(llc->dev); |
503 | 501 | ||
504 | if (nskb) { | 502 | if (nskb) { |
505 | u8 f_bit = 1; | ||
506 | struct llc_sap *sap = llc->sap; | 503 | struct llc_sap *sap = llc->sap; |
507 | 504 | ||
508 | llc_pdu_header_init(nskb, LLC_PDU_TYPE_S, sap->laddr.lsap, | 505 | llc_pdu_header_init(nskb, LLC_PDU_TYPE_S, sap->laddr.lsap, |
509 | llc->daddr.lsap, LLC_PDU_RSP); | 506 | llc->daddr.lsap, LLC_PDU_RSP); |
510 | llc_pdu_init_as_rej_rsp(nskb, f_bit, llc->vR); | 507 | llc_pdu_init_as_rej_rsp(nskb, 1, llc->vR); |
511 | rc = llc_mac_hdr_init(nskb, llc->dev->dev_addr, llc->daddr.mac); | 508 | rc = llc_mac_hdr_init(nskb, llc->dev->dev_addr, llc->daddr.mac); |
512 | if (rc) | 509 | if (rc) |
513 | goto free; | 510 | goto free; |
@@ -528,11 +525,10 @@ int llc_conn_ac_send_rej_xxx_x_set_0(struct sock *sk, struct sk_buff *skb) | |||
528 | 525 | ||
529 | if (nskb) { | 526 | if (nskb) { |
530 | struct llc_sap *sap = llc->sap; | 527 | struct llc_sap *sap = llc->sap; |
531 | u8 f_bit = 0; | ||
532 | 528 | ||
533 | llc_pdu_header_init(nskb, LLC_PDU_TYPE_S, sap->laddr.lsap, | 529 | llc_pdu_header_init(nskb, LLC_PDU_TYPE_S, sap->laddr.lsap, |
534 | llc->daddr.lsap, LLC_PDU_RSP); | 530 | llc->daddr.lsap, LLC_PDU_RSP); |
535 | llc_pdu_init_as_rej_rsp(nskb, f_bit, llc->vR); | 531 | llc_pdu_init_as_rej_rsp(nskb, 0, llc->vR); |
536 | rc = llc_mac_hdr_init(nskb, llc->dev->dev_addr, llc->daddr.mac); | 532 | rc = llc_mac_hdr_init(nskb, llc->dev->dev_addr, llc->daddr.mac); |
537 | if (rc) | 533 | if (rc) |
538 | goto free; | 534 | goto free; |
@@ -577,11 +573,10 @@ int llc_conn_ac_send_rnr_rsp_f_set_1(struct sock *sk, struct sk_buff *skb) | |||
577 | 573 | ||
578 | if (nskb) { | 574 | if (nskb) { |
579 | struct llc_sap *sap = llc->sap; | 575 | struct llc_sap *sap = llc->sap; |
580 | u8 f_bit = 1; | ||
581 | 576 | ||
582 | llc_pdu_header_init(nskb, LLC_PDU_TYPE_S, sap->laddr.lsap, | 577 | llc_pdu_header_init(nskb, LLC_PDU_TYPE_S, sap->laddr.lsap, |
583 | llc->daddr.lsap, LLC_PDU_RSP); | 578 | llc->daddr.lsap, LLC_PDU_RSP); |
584 | llc_pdu_init_as_rnr_rsp(nskb, f_bit, llc->vR); | 579 | llc_pdu_init_as_rnr_rsp(nskb, 1, llc->vR); |
585 | rc = llc_mac_hdr_init(nskb, llc->dev->dev_addr, llc->daddr.mac); | 580 | rc = llc_mac_hdr_init(nskb, llc->dev->dev_addr, llc->daddr.mac); |
586 | if (rc) | 581 | if (rc) |
587 | goto free; | 582 | goto free; |
@@ -601,12 +596,11 @@ int llc_conn_ac_send_rnr_xxx_x_set_0(struct sock *sk, struct sk_buff *skb) | |||
601 | struct sk_buff *nskb = llc_alloc_frame(llc->dev); | 596 | struct sk_buff *nskb = llc_alloc_frame(llc->dev); |
602 | 597 | ||
603 | if (nskb) { | 598 | if (nskb) { |
604 | u8 f_bit = 0; | ||
605 | struct llc_sap *sap = llc->sap; | 599 | struct llc_sap *sap = llc->sap; |
606 | 600 | ||
607 | llc_pdu_header_init(nskb, LLC_PDU_TYPE_S, sap->laddr.lsap, | 601 | llc_pdu_header_init(nskb, LLC_PDU_TYPE_S, sap->laddr.lsap, |
608 | llc->daddr.lsap, LLC_PDU_RSP); | 602 | llc->daddr.lsap, LLC_PDU_RSP); |
609 | llc_pdu_init_as_rnr_rsp(nskb, f_bit, llc->vR); | 603 | llc_pdu_init_as_rnr_rsp(nskb, 0, llc->vR); |
610 | rc = llc_mac_hdr_init(nskb, llc->dev->dev_addr, llc->daddr.mac); | 604 | rc = llc_mac_hdr_init(nskb, llc->dev->dev_addr, llc->daddr.mac); |
611 | if (rc) | 605 | if (rc) |
612 | goto free; | 606 | goto free; |
@@ -712,11 +706,10 @@ int llc_conn_ac_send_ack_rsp_f_set_1(struct sock *sk, struct sk_buff *skb) | |||
712 | 706 | ||
713 | if (nskb) { | 707 | if (nskb) { |
714 | struct llc_sap *sap = llc->sap; | 708 | struct llc_sap *sap = llc->sap; |
715 | u8 f_bit = 1; | ||
716 | 709 | ||
717 | llc_pdu_header_init(nskb, LLC_PDU_TYPE_S, sap->laddr.lsap, | 710 | llc_pdu_header_init(nskb, LLC_PDU_TYPE_S, sap->laddr.lsap, |
718 | llc->daddr.lsap, LLC_PDU_RSP); | 711 | llc->daddr.lsap, LLC_PDU_RSP); |
719 | llc_pdu_init_as_rr_rsp(nskb, f_bit, llc->vR); | 712 | llc_pdu_init_as_rr_rsp(nskb, 1, llc->vR); |
720 | rc = llc_mac_hdr_init(nskb, llc->dev->dev_addr, llc->daddr.mac); | 713 | rc = llc_mac_hdr_init(nskb, llc->dev->dev_addr, llc->daddr.mac); |
721 | if (rc) | 714 | if (rc) |
722 | goto free; | 715 | goto free; |