Skip to content

Commit f176373

Browse files
wenyingdwenyingd
committed
Remove unused code
Signed-off-by: wenyingd <wenyingd@vmware.com>
1 parent 557fdf7 commit f176373

4 files changed

Lines changed: 0 additions & 25 deletions

File tree

‎openflow13/action.go‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,6 @@ type ActionNwTtl struct {
321321
type ActionPush struct {
322322
ActionHeader
323323
EtherType uint16
324-
pad []byte // 2bytes
325324
}
326325

327326
func NewActionPushVlan(etherType uint16) *ActionPush {
@@ -395,7 +394,6 @@ func (a *ActionPopVlan) UnmarshalBinary(data []byte) error {
395394
type ActionPopMpls struct {
396395
ActionHeader
397396
EtherType uint16
398-
pad []byte // 2bytes
399397
}
400398

401399
func NewActionPopMpls(etherType uint16) *ActionPopMpls {

‎openflow13/nx_action.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1416,7 +1416,6 @@ type NXActionController struct {
14161416
MaxLen uint16
14171417
ControllerID uint16
14181418
Reason uint8
1419-
pad uint8
14201419
}
14211420

14221421
func (a *NXActionController) Len() uint16 {

‎openflow13/nxt_message.go‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,6 @@ const (
289289
type ContinuationPropBridge struct {
290290
*PropHeader /* Type: NXCPT_BRIDGE */
291291
Bridge [4]uint32
292-
pad [4]uint8
293292
}
294293

295294
func (p *ContinuationPropBridge) Len() (n uint16) {
@@ -338,7 +337,6 @@ func (p *ContinuationPropBridge) UnmarshalBinary(data []byte) error {
338337
type ContinuationPropStack struct {
339338
*PropHeader /* Type: NXCPT_STACK */
340339
Stack []uint8
341-
pad []uint8
342340
}
343341

344342
func (p *ContinuationPropStack) Len() (n uint16) {
@@ -427,7 +425,6 @@ func (p *ContinuationPropMirrors) UnmarshalBinary(data []byte) error {
427425

428426
type ContinuationPropConntracked struct {
429427
*PropHeader /* Type: NXCPT_CONNTRACKED */
430-
pad [4]uint8
431428
}
432429

433430
func (p *ContinuationPropConntracked) Len() (n uint16) {
@@ -466,7 +463,6 @@ func (p *ContinuationPropConntracked) UnmarshalBinary(data []byte) error {
466463
type ContinuationPropTableID struct {
467464
*PropHeader /* Type: NXCPT_TABLE_ID */
468465
TableID uint8
469-
pad [3]uint8
470466
}
471467

472468
func (p *ContinuationPropTableID) Len() (n uint16) {
@@ -508,7 +504,6 @@ func (p *ContinuationPropTableID) UnmarshalBinary(data []byte) error {
508504

509505
type ContinuationPropCookie struct {
510506
*PropHeader /* Type: NXCPT_COOKIE */
511-
pad [4]uint8
512507
Cookie uint64
513508
}
514509

@@ -551,7 +546,6 @@ func (p *ContinuationPropCookie) UnmarshalBinary(data []byte) error {
551546

552547
type ContinuationPropActions struct {
553548
*PropHeader /* Type: NXCPT_ACTIONS */
554-
pad [4]uint8
555549
Actions []Action
556550
}
557551

@@ -614,7 +608,6 @@ func (p *ContinuationPropActions) UnmarshalBinary(data []byte) error {
614608

615609
type ContinuationPropActionSet struct {
616610
*PropHeader /* Type: NXCPT_ACTION_SET */
617-
pad [4]uint8
618611
ActionSet []Action
619612
}
620613

@@ -769,7 +762,6 @@ const (
769762
type PacketIn2PropPacket struct {
770763
*PropHeader
771764
Packet protocol.Ethernet
772-
pad []uint8
773765
}
774766

775767
func (p *PacketIn2PropPacket) Len() (n uint16) {
@@ -946,7 +938,6 @@ func (p *PacketIn2PropTableID) UnmarshalBinary(data []byte) error {
946938

947939
type PacketIn2PropCookie struct {
948940
*PropHeader /* Type: NXPINT_COOKIE */
949-
pad [4]uint8
950941
Cookie uint64
951942
}
952943

@@ -992,7 +983,6 @@ func (p *PacketIn2PropCookie) UnmarshalBinary(data []byte) error {
992983
type PacketIn2PropReason struct {
993984
*PropHeader /* Type: NXPINT_COOKIE */
994985
Reason uint8
995-
pad [3]uint8
996986
}
997987

998988
func (p *PacketIn2PropReason) Len() (n uint16) {
@@ -1035,7 +1025,6 @@ func (p *PacketIn2PropReason) UnmarshalBinary(data []byte) error {
10351025
type PacketIn2PropMetadata struct {
10361026
*PropHeader /* Type: NXPINT_METADATA */
10371027
Fields []MatchField
1038-
pad []uint8
10391028
}
10401029

10411030
func (p *PacketIn2PropMetadata) Len() (n uint16) {
@@ -1100,7 +1089,6 @@ func (p *PacketIn2PropMetadata) UnmarshalBinary(data []byte) error {
11001089
type PacketIn2PropUserdata struct {
11011090
*PropHeader /* Type: NXPINT_USERDATA */
11021091
Userdata []uint8
1103-
pad []uint8
11041092
}
11051093

11061094
func (p *PacketIn2PropUserdata) Len() (n uint16) {
@@ -1145,7 +1133,6 @@ func (p *PacketIn2PropUserdata) UnmarshalBinary(data []byte) error {
11451133
type PacketIn2PropContinuation struct {
11461134
*PropHeader /* Type: NXPINT_CONTINUATION */
11471135
Continuation []byte
1148-
pad []uint8
11491136
}
11501137

11511138
func (p *PacketIn2PropContinuation) Len() (n uint16) {

‎openflow15/nx_action.go‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1239,7 +1239,6 @@ type NXActionLearn struct {
12391239
Cookie uint64
12401240
Flags uint16
12411241
TableID uint8
1242-
pad uint8
12431242
FinIdleTimeout uint16
12441243
FinHardTimeout uint16
12451244
LearnSpecs []*NXLearnSpec
@@ -1385,7 +1384,6 @@ func NewNXActionNote() *NXActionNote {
13851384
type NXActionRegLoad2 struct {
13861385
*NXActionHeader
13871386
DstField *MatchField
1388-
pad []byte
13891387
}
13901388

13911389
func NewNXActionRegLoad2(dstField *MatchField) *NXActionRegLoad2 {
@@ -1443,7 +1441,6 @@ type NXActionController struct {
14431441
MaxLen uint16
14441442
ControllerID uint16
14451443
Reason uint8
1446-
pad uint8
14471444
}
14481445

14491446
func (a *NXActionController) Len() uint16 {
@@ -1513,7 +1510,6 @@ const (
15131510
type NXActionController2PropMaxLen struct {
15141511
*PropHeader /* Type: NXAC2PT_MAX_LEN */
15151512
MaxLen uint16
1516-
pad [2]uint8
15171513
}
15181514

15191515
func (a *NXActionController2PropMaxLen) Len() uint16 {
@@ -1565,7 +1561,6 @@ func NewMaxLen(maxLen uint16) *NXActionController2PropMaxLen {
15651561
type NXActionController2PropControllerID struct {
15661562
*PropHeader /* Type: NXAC2PT_CONTROLLER_ID */
15671563
ControllerID uint16
1568-
pad [2]uint8
15691564
}
15701565

15711566
func (a *NXActionController2PropControllerID) Len() uint16 {
@@ -1617,7 +1612,6 @@ func NewControllerID(controllerID uint16) *NXActionController2PropControllerID {
16171612
type NXActionController2PropReason struct {
16181613
*PropHeader /* Type: NXAC2PT_REASON */
16191614
Reason uint8
1620-
pad [3]uint8
16211615
}
16221616

16231617
func (a *NXActionController2PropReason) Len() uint16 {
@@ -1669,7 +1663,6 @@ func NewReason(reason uint8) *NXActionController2PropReason {
16691663
type NXActionController2PropUserdata struct {
16701664
*PropHeader /* Type: NXAC2PT_USERDATA */
16711665
Userdata []byte
1672-
pad []uint8
16731666
}
16741667

16751668
func (a *NXActionController2PropUserdata) Len() uint16 {
@@ -1721,7 +1714,6 @@ func NewUserdata(userdata []byte) *NXActionController2PropUserdata {
17211714

17221715
type NXActionController2PropPause struct {
17231716
*PropHeader /* Type: NXAC2PT_PAUSE */
1724-
pad [4]uint8
17251717
}
17261718

17271719
func (a *NXActionController2PropPause) Len() uint16 {
@@ -1845,7 +1837,6 @@ func DecodeController2Prop(data []byte) (Property, error) {
18451837
// NXActionController2 is NX action to output packet to the Controller set with a specified ID.
18461838
type NXActionController2 struct {
18471839
*NXActionHeader
1848-
pad [6]uint8
18491840

18501841
props []Property
18511842
}

0 commit comments

Comments
 (0)